From afdb46486a089d47d3b49f9d350097a97a51891e Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 22 Aug 2010 06:26:50 +0200 Subject: [PATCH] Require Automake 1.11.1 for Libtool, enable color-tests. * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1. Enable color-tests. (LTDL_SUBDIR_LIBOBJS): Remove now-obsolete conditional and feature test for Autoconf 2.59 and Automake 1.9.x workaround. * Makefile.am: Simplify accordingly. * bootstrap: Remove obsolete WORKING_LIBOBJ_SUPPORT workarounds for Autoconf 2.59 and Automake 1.9.6. Signed-off-by: Ralf Wildenhues --- ChangeLog | 11 +++++++++++ Makefile.am | 9 --------- bootstrap | 14 -------------- configure.ac | 10 ++-------- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d5840f61..d17e7b553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-08-22 Ralf Wildenhues + + Require Automake 1.11.1 for Libtool, enable color-tests. + * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1. Enable + color-tests. + (LTDL_SUBDIR_LIBOBJS): Remove now-obsolete conditional and + feature test for Autoconf 2.59 and Automake 1.9.x workaround. + * Makefile.am: Simplify accordingly. + * bootstrap: Remove obsolete WORKING_LIBOBJ_SUPPORT workarounds + for Autoconf 2.59 and Automake 1.9.6. + 2010-08-21 Rainer Tammer (tiny change) Avoid issues with AIX resident shared libraries in old testsuite. diff --git a/Makefile.am b/Makefile.am index d689e09c6..78329d218 100644 --- a/Makefile.am +++ b/Makefile.am @@ -307,15 +307,6 @@ $(srcdir)/libltdl/config-h.in: $(sub_configure_deps) include libltdl/Makefile.inc -if ! LTDL_SUBDIR_LIBOBJS -## workaround for Autoconf 2.59, Automake 1.9.6: -## we include these files twice, because of missing LIBOBJDIR support. -EXTRA_DIST += \ - argz.c libltdl/argz.c \ - lt__dirent.c libltdl/lt__dirent.c \ - lt__strl.c libltdl/lt__strl.c -endif - ## -------------- ## ## Documentation. ## diff --git a/bootstrap b/bootstrap index 410c983b2..7ad0979e4 100755 --- a/bootstrap +++ b/bootstrap @@ -46,7 +46,6 @@ export SHELL : ${SED=sed} : ${LN_S='ln -s'} : ${MAKEINFO=makeinfo} -: ${WORKING_LIBOBJ_SUPPORT=false} case $1 in --help|-h*) @@ -54,8 +53,6 @@ case $1 in `echo $0 | sed 's,^.*/,,g'`: This script is designed to bootstrap a fresh repository checkout of Libtool. Useful environment variable settings: reconfdirs='. libltdl' Do not bootstrap the old test suite. - WORKING_LIBOBJ_SUPPORT=: Declare that you have fixed LIBOBJDIR support - in autoconf (> 2.59) and automake (> 1.9.6). EOF exit ;; @@ -97,19 +94,8 @@ find . -depth \( -name autom4te.cache -o -name libtool \) -print \ # Delete stale files from previous libtool versions. rm -f acinclude.m4 libltdl/config.h -# Workaround for missing LIBOBJDIR support in Autoconf 2.59, Automake 1.9.6: -# Have symlinks of the libobj files in top source dir. -# Set WORKING_LIBOBJ_SUPPORT=: when calling bootstrap if you have fixed tools. -case `($AUTOCONF --version) 2>/dev/null` in - *\ 2.59[c-z]* | *\ 2.[6-9][0-9]* | *\ [3-9].[0-9]*) - case `($AUTOMAKE --version) 2>/dev/null` in - *\ 1.9[a-z]* | *\ 1.1[0-9]* | *\ 1.[2-9][0-9]* | *\ [2-9].[0-9]*) - WORKING_LIBOBJ_SUPPORT=: ;; - esac ;; -esac for file in argz.c lt__dirent.c lt__strl.c; do rm -f $file - $WORKING_LIBOBJ_SUPPORT || $LN_S libltdl/$file $file done if test -z "$reconfdirs"; then diff --git a/configure.ac b/configure.ac index 35c79f1e8..e1d55ef91 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,8 @@ AC_SUBST([package_revision]) dnl These are bootstrap requirements! Once built, libtool may work with dnl much older releases of autoconf and automake. See release notes. -AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) +dnl 1.11 is needed for color-tests, 1.11.1 fixes a security issue. +AM_INIT_AUTOMAKE([1.11.1 gnu subdir-objects dist-lzma color-tests]) dnl We use m4sh to generate libtool's portable shell scripts AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) @@ -133,13 +134,6 @@ AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) dnl Make sure config.status is regenerated when the version timestamp changes AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/ChangeLog']) -dnl when installed libtool is used with automake-1.9.x or autoconf-2.59, -dnl subdir libobjs don't work without a little extra help -AC_MSG_CHECKING([whether subdir libobjs are useable]) -test -f $srcdir/argz.c || sublibobjs_supported=yes -AM_CONDITIONAL([LTDL_SUBDIR_LIBOBJS], test x"${sublibobjs_supported-no}" != xno) -AC_MSG_RESULT([${sublibobjs_supported-no}]) - ## ------------------------------- ## ## Libtool specific configuration. ## -- 2.47.3