bootstrap: check for LT_INIT, too

* build-aux/bootstrap: Both AC_PROG_LIBTOOL and AM_PROG_LIBTOOL
are deprecated.  Suggestion from Ralf Wildenhues.

diff --git a/ChangeLog b/ChangeLog
index 7bd8c48c07d72f5b0d706d8172f72fd0036ff169..f06b946855fea2b3360ffd34945a5bca994303f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-05  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: check for LT_INIT, too
+       * build-aux/bootstrap: Both AC_PROG_LIBTOOL and AM_PROG_LIBTOOL
+       are deprecated.  Suggestion from Ralf Wildenhues.
+
 2008-10-05  Bruno Haible  <bruno@clisp.org>
 
        * lib/spawn.in.h (POSIX_SPAWN_*): Use the system's values, rather than

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index ae2b8a2f8287718e6b0957a1c45c301008ffec70..74573efaa60a23d82ca920fd6b3b8e711e30e2d7 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -597,7 +597,7 @@ for command in \
   'automake --add-missing --copy --force-missing';
 do
   if test "$command" = libtool; then
-    grep '^[    ]*A[CM]_PROG_LIBTOOL\>' configure.ac >/dev/null ||
+    grep -E '^[         ]*(LT_INIT|A[CM]_PROG_LIBTOOL)\>' configure.ac >/dev/null ||
       continue
     command='libtoolize -c -f'
   fi