From: Jim Meyering <meyering@redhat.com>
Date: Sun, 5 Oct 2008 06:24:04 +0000 (+0200)
Subject: bootstrap: check for AC_PROG_LIBTOOL as well as AM_PROG_LIBTOOL
X-Git-Tag: v0.1~6905
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1ff16a1235ed546f04b219966a9142a2334a7b4b;p=gnulib.git

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 a360f8c2e..6cbd73952 100644
--- 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 1134a6518..ae2b8a2f8 100755
--- 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