From 327d20a1a7c304ee722ce5406fe3d6788c4d3dc4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 4 Feb 2001 03:29:14 +0000 Subject: [PATCH] * automake.in (scan_one_autoconf_file): Disable warning about AM_PROG_LIBTOOL. --- ChangeLog | 3 +++ automake.in | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aef51eb7..2dcd79a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-03 Tom Tromey + * 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 b422e422..dcfb6e66 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 . ':' . $.; -- 2.43.5