diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-22 06:26:50 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-22 06:26:50 +0200 |
| commit | afdb46486a089d47d3b49f9d350097a97a51891e (patch) | |
| tree | 941d4ae5254337e3a77b4541e19ccd1e0db5a719 /configure.ac | |
| parent | c9ee137683c618c9c1f2fedbb4b9e970615dfc99 (diff) | |
| download | libtool-afdb46486a089d47d3b49f9d350097a97a51891e.tar.gz | |
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 <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 35c79f1e..e1d55ef9 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. ## |