* libtoolize.in: search for A[MC]_PROG_LIBTOOL, not

AM_PROG_LIBTOOL
Reported by Jeff Garzik <jgarzik@pobox.com>

diff --git a/ChangeLog b/ChangeLog
index d283993d86f3294c4be83bef23e3c3640efdecdc..376952cf1d318b763640309dc64510cb2d3e82f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libtoolize.in: search for A[MC]_PROG_LIBTOOL, not
+       AM_PROG_LIBTOOL
+       Reported by Jeff Garzik <jgarzik@pobox.com>
+
 1999-01-27  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
 
        * THANKS: Now that we have a policy, applied it to the existing

diff --git a/libtoolize.in b/libtoolize.in
index 0652c9d37f400b4ebd3a95aaaf6801029546ea04..12dc87d143f06db6072a18116aea4996a30feef0 100644 (file)
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -184,7 +184,7 @@ else
 fi
 
 if test -z "$automake"; then
-  if egrep '^AM_PROG_LIBTOOL' configure.in >/dev/null 2>&1; then :
+  if egrep '^A[MC]_PROG_LIBTOOL' configure.in >/dev/null 2>&1; then :
   else
     echo "Remember to add \`AM_PROG_LIBTOOL' to \`configure.in'."
   fi
@@ -199,15 +199,15 @@ if test -z "$automake"; then
     updatemsg="add the contents of \`$libtool_m4' to \`aclocal.m4'"
   fi
 
-  if egrep '^AC_DEFUN\(AM_PROG_LIBTOOL' aclocal.m4 >/dev/null 2>&1; then
+  if egrep '^AC_DEFUN\(A[MC]_PROG_LIBTOOL' aclocal.m4 >/dev/null 2>&1; then
     # Check the version number on libtool.m4 and the one used in aclocal.m4.
-    instserial=`grep '^# serial ' $libtool_m4 | grep 'AM_PROG_LIBTOOL' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
+    instserial=`grep '^# serial ' $libtool_m4 | grep 'A[MC]_PROG_LIBTOOL' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 
     if test -z "$instserial"; then
       echo "$progname: warning: no serial number on \`$libtool_m4'" 1>&2
     else
       # If the local macro has no serial number, we assume it's ancient.
-      localserial=`grep '^# serial ' aclocal.m4 | grep 'AM_PROG_LIBTOOL' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
+      localserial=`grep '^# serial ' aclocal.m4 | grep 'A[MC]_PROG_LIBTOOL' | sed -e 's/^# serial \([0-9][0-9]*\).*$/\1/; q'`
 
       test -z "$localserial" && localserial=0