Author: cazfi
Date: Thu Feb 4 02:04:13 2016
New Revision: 31740
URL: http://svn.gna.org/viewcvs/freeciv?rev=31740&view=rev
Log:
Set libtool --preserve-dup-deps via AM_LIBTOOLFLAGS in client/ only.
Minimum automake version requirement increased to 1.10.
See patch #6890
Modified:
branches/S2_6/INSTALL
branches/S2_6/autogen.sh
branches/S2_6/client/Makefile.am
branches/S2_6/configure.ac
branches/S2_6/doc/README.packaging
Modified: branches/S2_6/INSTALL
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/INSTALL?rev=31740&r1=31739&r2=31740&view=diff
==============================================================================
--- branches/S2_6/INSTALL (original)
+++ branches/S2_6/INSTALL Thu Feb 4 02:04:13 2016
@@ -93,7 +93,7 @@
Autoconf is required to create configure from configure.ac.
- - GNU automake version 1.9 or better
+ - GNU automake version 1.10 or better
Automake is required to create the various Makefile.in from
Makefile.am.
Modified: branches/S2_6/autogen.sh
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/autogen.sh?rev=31740&r1=31739&r2=31740&view=diff
==============================================================================
--- branches/S2_6/autogen.sh (original)
+++ branches/S2_6/autogen.sh Thu Feb 4 02:04:13 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 9 || DIE=1
+real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 10 ||
DIE=1
AUTOMAKE=$REALPKGNAME
-real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 9 || DIE=1
+real_package_name "aclocal" "ftp://ftp.gnu.org/pub/gnu/automake/"; 1 10 || DIE=1
ACLOCAL=$REALPKGNAME
real_package_name "libtoolize" "ftp://ftp.gnu.org/pub/gnu/libtool/"; 1 5 2 ||
DIE=1
LIBTOOLIZE=$REALPKGNAME
Modified: branches/S2_6/client/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/Makefile.am?rev=31740&r1=31739&r2=31740&view=diff
==============================================================================
--- branches/S2_6/client/Makefile.am (original)
+++ branches/S2_6/client/Makefile.am Thu Feb 4 02:04:13 2016
@@ -82,6 +82,8 @@
-I$(srcdir)/luascript -I$(srcdir)/agents \
$(CLIENT_CFLAGS) $(SOUND_CFLAGS) \
-I$(top_srcdir)/dependencies/cvercmp
+
+AM_LIBTOOLFLAGS = --preserve-dup-deps
# Build client common functionality in to library
# instead linking them directly to the client. This is necessary
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31740&r1=31739&r2=31740&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Thu Feb 4 02:04:13 2016
@@ -562,7 +562,6 @@
dnl Replace AC_PROG_LIBTOOL with LT_INIT when minimum libtool
dnl version 2.2
AC_PROG_LIBTOOL
-LIBTOOL="$LIBTOOL --preserve-dup-deps"
AC_SUBST(LIBTOOL)
AC_CHECK_TOOL(AR, ar)
if test -z $AR; then
Modified: branches/S2_6/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=31740&r1=31739&r2=31740&view=diff
==============================================================================
--- branches/S2_6/doc/README.packaging (original)
+++ branches/S2_6/doc/README.packaging Thu Feb 4 02:04:13 2016
@@ -33,6 +33,7 @@
for tolua from the system. You have to use system tolua when
cross-compiling.
* Minimum libtool version is now 1.5.2
+* Minimum automake version is not 1.10
* For translation support minimum gettext version is now 0.14. It's
still possible to build completely without translation support
with configure option --disable-nls
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
