* automake.in (scan_one_autoconf_file): Disable warning about

	AM_PROG_LIBTOOL.

diff --git a/ChangeLog b/ChangeLog
index aef51eb77e6131b9abc1421c51557a3df51fe632..2dcd79a2edf5ecd4a96fc8fb6f9c2f5d08634934 100644 (file)
--- 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 b422e42216ac260c5a33f61137e8ed99d8d6eb1b..dcfb6e663ffdda65d56ee73e87ae57244d021715 100755 (executable)
--- 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 . ':' . $.;