Author: cazfi Date: Wed Feb 10 12:34:33 2016 New Revision: 31852 URL: http://svn.gna.org/viewcvs/freeciv?rev=31852&view=rev Log: Use AM_PROG_AR instead of AC_CHECK_TOOL(ar)
See patch #6930 Modified: trunk/INSTALL trunk/autogen.sh trunk/configure.ac trunk/doc/README.packaging trunk/scripts/diff_ignore Modified: trunk/INSTALL URL: http://svn.gna.org/viewcvs/freeciv/trunk/INSTALL?rev=31852&r1=31851&r2=31852&view=diff ============================================================================== --- trunk/INSTALL (original) +++ trunk/INSTALL Wed Feb 10 12:34:33 2016 @@ -4,7 +4,7 @@ This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 20-Dec-15. +Last minor update was 08-Feb-16. There may be a localized version of this file in the ./doc directory, named INSTALL.<locale> (e.g., INSTALL.de). @@ -100,7 +100,7 @@ Autoconf is required to create configure from configure.ac. - - GNU automake version 1.11 or better + - GNU automake version 1.11.2 or better Automake is required to create the various Makefile.in from Makefile.am. Modified: trunk/autogen.sh URL: http://svn.gna.org/viewcvs/freeciv/trunk/autogen.sh?rev=31852&r1=31851&r2=31852&view=diff ============================================================================== --- trunk/autogen.sh (original) +++ trunk/autogen.sh Wed Feb 10 12:34:33 2016 @@ -240,9 +240,9 @@ AUTOHEADER=$REALPKGNAME # automake and aclocal version numbers must be kept in sync -real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 +real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 2 || DIE=1 AUTOMAKE=$REALPKGNAME -real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 +real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 2 || DIE=1 ACLOCAL=$REALPKGNAME real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 || DIE=1 LIBTOOLIZE=$REALPKGNAME Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=31852&r1=31851&r2=31852&view=diff ============================================================================== --- trunk/configure.ac (original) +++ trunk/configure.ac Wed Feb 10 12:34:33 2016 @@ -603,11 +603,11 @@ AC_PROG_CPP AC_PROG_LN_S AC_DISABLE_SHARED -LT_INIT -AC_CHECK_TOOL(AR, ar) +AM_PROG_AR if test -z $AR; then AC_MSG_ERROR([*** 'ar' missing. Install binutils, fix your \$PATH, or set \$AR manually. ***]) fi +LT_INIT AM_PROG_CC_C_O AC_PROG_CXX Modified: trunk/doc/README.packaging URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.packaging?rev=31852&r1=31851&r2=31852&view=diff ============================================================================== --- trunk/doc/README.packaging (original) +++ trunk/doc/README.packaging Wed Feb 10 12:34:33 2016 @@ -17,7 +17,7 @@ (e.g. ~/.freeciv/freeciv-client-rc-2.6 generated by Freeciv 2.6, ~/.freeciv-client-rc-2.5 generated by Freeciv 2.5, or ~/.civclientrc generated by Freeciv version <= 2.1). -* Minimum autoconf version is now 2.64, automake 1.11 +* Minimum autoconf version is now 2.64, automake 1.11.2 * Tinycthreads can be used as threading implementation. Copy of tinycthreads can be compiled in to freeciv by configuring with --with-tinycthread. * libicu is a new hard requirement Modified: trunk/scripts/diff_ignore URL: http://svn.gna.org/viewcvs/freeciv/trunk/scripts/diff_ignore?rev=31852&r1=31851&r2=31852&view=diff ============================================================================== --- trunk/scripts/diff_ignore (original) +++ trunk/scripts/diff_ignore Wed Feb 10 12:34:33 2016 @@ -53,6 +53,7 @@ install-sh missing mkinstalldirs +ar-lib ref-add.sed ref-del.sed fcser _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits