From: Tom Tromey <tromey@redhat.com>
Date: Sun, 4 Feb 2001 03:29:15 +0000 (+0000)
Subject: 	* automake.in (scan_one_autoconf_file): Disable warning about
X-Git-Tag: Release-1-4d~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edc0b41dfd586aec2c79aed04032df877a39486;p=thirdparty%2Fautomake.git

	* automake.in (scan_one_autoconf_file): Disable warning about
	AM_PROG_LIBTOOL.
---

diff --git a/ChangeLog b/ChangeLog
index aef51eb77..2dcd79a2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-03  Tom Tromey  <tromey@redhat.com>
 
+	* automake.in (scan_one_autoconf_file): Disable warning about
+	AM_PROG_LIBTOOL.
+
 	* automake.in (handle_configure): Don't modify variable which
 	aliases list element.  Don't push @inputs onto the dist list.
 	Fixes colon7.test.
diff --git a/automake.in b/automake.in
index b422e4221..dcfb6e663 100755
--- a/automake.in
+++ b/automake.in
@@ -4702,10 +4702,16 @@ sub scan_one_autoconf_file
 
         if (/A(C|M)_PROG_LIBTOOL/)
 	{
-	    if (/AM_PROG_LIBTOOL/)
-	    {
-	    	&am_conf_line_warning ($filename, $., "\`AM_PROG_LIBTOOL' is obsolete, use \`AC_PROG_LIBTOOL' instead");
-	    }
+	    # We're not ready for this yet.  People still use a
+	    # libtool with no AC_PROG_LIBTOOL.  Once that is the
+	    # dominant version we can reenable this code -- but next
+	    # time by mentioning the macro in %obsolete_macros, both
+	    # here and in aclocal.in.
+
+	    # if (/AM_PROG_LIBTOOL/)
+	    # {
+	    # 	&am_conf_line_warning ($filename, $., "\`AM_PROG_LIBTOOL' is obsolete, use \`AC_PROG_LIBTOOL' instead");
+	    # }
 	    $seen_libtool = 1;
 	    $libtool_line = $.;
 	    $configure_vars{'LIBTOOL'} = $filename . ':' . $.;