changeset 16285:59c01cd32e37

bootstrap: properly check for libtool Commit 767ccd40 changed things to invoke libtoolize before gnulib-tool, but only for projects that use LT_INIT, even though we had already probed for libtool via older spellings. * build-aux/bootstrap (libtoolize): Also run libtool when older usage is detected. Signed-off-by: Eric Blake <eblake@redhat.com>
author Eric Blake <eblake@redhat.com>
date Mon, 16 Jan 2012 10:16:01 -0700
parents ab517781f037
children 9f5a09cb866c
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-16  Eric Blake  <eblake@redhat.com>
+
+	bootstrap: properly check for libtool
+	* build-aux/bootstrap (libtoolize): Also run libtool when older
+	usage is detected.
+
 2012-01-15  Bruno Haible  <bruno@clisp.org>
 
 	Improve support for MSVC 9.
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2012-01-06.07; # UTC
+scriptversion=2012-01-16.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -758,7 +758,7 @@
 # Autoreconf runs aclocal before libtoolize, which causes spurious
 # warnings if the initial aclocal is confused by the libtoolized
 # (or worse out-of-date) macro directory.
-if grep '^[    ]*LT_INIT' configure.ac >/dev/null; then
+if test $use_libtool = 1; then
   echo "running: $LIBTOOLIZE --copy --install"
   $LIBTOOLIZE --copy --install
 fi