Author: cazfi
Date: Wed Feb 10 12:34:40 2016
New Revision: 31853
URL: http://svn.gna.org/viewcvs/freeciv?rev=31853&view=rev
Log:
Use AM_PROG_AR instead of AC_CHECK_TOOL(ar)
See patch #6930
Modified:
branches/S2_6/configure.ac
branches/S2_6/scripts/diff_ignore
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31853&r1=31852&r2=31853&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Wed Feb 10 12:34:40 2016
@@ -561,9 +561,9 @@
AC_DISABLE_SHARED
dnl Replace AC_PROG_LIBTOOL with LT_INIT when minimum libtool
dnl version 2.2
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [AC_CHECK_TOOL([AR], [ar])])
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL)
-AC_CHECK_TOOL(AR, ar)
if test -z $AR; then
AC_MSG_ERROR([*** 'ar' missing. Install binutils, fix your \$PATH, or
set \$AR manually. ***])
fi
Modified: branches/S2_6/scripts/diff_ignore
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/scripts/diff_ignore?rev=31853&r1=31852&r2=31853&view=diff
==============================================================================
--- branches/S2_6/scripts/diff_ignore (original)
+++ branches/S2_6/scripts/diff_ignore Wed Feb 10 12:34:40 2016
@@ -54,6 +54,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
