bootstrap: check for AC_PROG_LIBTOOL as well as AM_PROG_LIBTOOL

* build-aux/bootstrap: Check for AC_PROG_LIBTOOL, as well as the
obsolete AM_PROG_LIBTOOL.
Spotted by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.

diff --git a/ChangeLog b/ChangeLog
index a360f8c..6cbd739 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-05  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: check for AC_PROG_LIBTOOL as well as AM_PROG_LIBTOOL
+       * build-aux/bootstrap: Check for AC_PROG_LIBTOOL, as well as the
+       obsolete AM_PROG_LIBTOOL.
+       Spotted by Debarshi 'Rishi' Ray <debarshi.ray@gmail.com>.
+
 2008-10-04  Bruno Haible  <bruno@clisp.org>
 
        * modules/dup2 (License): Change to LGPLv2+.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 1134a65..ae2b8a2 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 '^[    ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null ||
+    grep '^[    ]*A[CM]_PROG_LIBTOOL\>' configure.ac >/dev/null ||
       continue
     command='libtoolize -c -f'
   fi