From baeca5233ac78c53e98df2135a2b986395265e91 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 27 Jan 1999 19:38:13 +0000 Subject: [PATCH] * libtoolize.in: search for A[MC]_PROG_LIBTOOL, not AM_PROG_LIBTOOL Reported by Jeff Garzik --- ChangeLog | 6 ++++++ libtoolize.in | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d283993d..376952cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-01-27 Alexandre Oliva + + * libtoolize.in: search for A[MC]_PROG_LIBTOOL, not + AM_PROG_LIBTOOL + Reported by Jeff Garzik + 1999-01-27 Gary V. Vaughan * THANKS: Now that we have a policy, applied it to the existing diff --git a/libtoolize.in b/libtoolize.in index 0652c9d3..12dc87d1 100644 --- 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