* automake.in (scan_autoconf_traces): Trace for LT_SUPPORTED_TAG

instead of AC_LIBTOOL_TAGS, since that how CVS Libtool has been
changed.
* tests/libtool3.test: Do not grep for --tag=CC, since CVS
Libtool (unlike Libtool 1.5) does not has any CC tag.

diff --git a/ChangeLog b/ChangeLog
index 376bcd113f61058748281a7d48806ea9fd27f468..3911da8247ab44da9428da9b1571b248e970fb7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-05-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.in (scan_autoconf_traces): Trace for LT_SUPPORTED_TAG
+       instead of AC_LIBTOOL_TAGS, since that how CVS Libtool has been
+       changed.
+       * tests/libtool3.test: Do not grep for --tag=CC, since CVS
+       Libtool (unlike Libtool 1.5) does not has any CC tag.
+
        * tests/tar2.test: Skip the test if no pax archiver were found.
 
        * NEWS: Sync with branch-1-8, and reorganize current entry.

diff --git a/automake.in b/automake.in
index 7914b9d53e4c32f0e415793835bb0435de1d192c..9a64d6e3ad56158985fe5ee8b87294f4d6f22a51 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4626,7 +4626,6 @@ sub scan_autoconf_traces ($)
                AC_CONFIG_LINKS => 1,
                AC_INIT => 0,
                AC_LIBSOURCE => 1,
-               AC_LIBTOOL_TAGS => 0,
                AC_SUBST => 1,
                AM_AUTOMAKE_VERSION => 1,
                AM_CONDITIONAL => 2,
@@ -4635,10 +4634,11 @@ sub scan_autoconf_traces ($)
                AM_INIT_AUTOMAKE => 0,
                AM_MAINTAINER_MODE => 0,
                AM_PROG_CC_C_O => 0,
+               LT_SUPPORTED_TAG => 1,
+               _LT_AC_TAGCONFIG => 0,
                m4_include => 1,
                m4_sinclude => 1,
                sinclude => 1,
-               _LT_AC_TAGCONFIG => 0,
              );
 
   my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
@@ -4731,14 +4731,6 @@ sub scan_autoconf_traces ($)
        {
          $libsources{$args[1]} = $here;
        }
-      elsif ($macro eq 'AC_LIBTOOL_TAGS')
-       {
-          # Reset %libtool_tags, in case AC_LIBTOOL_TAGS is
-          # expansed after _LT_AC_TAGCONFIG.  We want to ignore
-         # _LT_AC_TAGCONFIG if AC_LIBTOOL_TAGS is called.
-          %libtool_tags = (CC => 1);
-          $libtool_tags{$_} = 1 foreach split (' ', $args[1]);
-       }
       elsif ($macro eq 'AC_SUBST')
        {
          # Just check for alphanumeric in AC_SUBST.  If you do
@@ -4815,13 +4807,16 @@ sub scan_autoconf_traces ($)
                if $mtime > $configure_deps_greatest_timestamp;
            }
        }
+      elsif ($macro eq 'LT_SUPPORTED_TAG')
+       {
+          $libtool_tags{$args[1]} = 1;
+       }
       elsif ($macro eq '_LT_AC_TAGCONFIG')
        {
          # _LT_AC_TAGCONFIG is an old macro present in Libtool 1.5.
-         # We use it to detect whether tags are supported.  Our prefered
-         # interface is AC_LIBTOOL_TAGS, but it was introduced in
-         # Libtool 1.6.  Ignore _LT_AC_TAGCONFIG if AC_LIBTOOL_TAGS has
-         # been called.
+         # We use it to detect whether tags are supported.  Our
+         # prefered interface is LT_SUPPORTED_TAG, but it was
+         # introduced in Libtool 1.6.
          if (0 == keys %libtool_tags)
            {
              # Hardcode the tags supported by Libtool 1.5.

diff --git a/tests/libtool3.test b/tests/libtool3.test
index a11e137bac4dacb6619ef8488110b2b356800e20..10940e863b562f43f138d2f3c94a813e85406d32 100755 (executable)
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -89,14 +89,5 @@ $FGREP 'a.lo:' Makefile.in
 
 ./configure
 
-# opportunistically check that --tag=CC is used when supported
-if test -n "`./libtool --help | grep tag=TAG`"; then
-  grep 'LTCOMPILE.*mode=compile --tag=CC' Makefile.in
-  grep 'LINK.*mode=link --tag=CC' Makefile.in
-  # We also expect --tag=CC to appear twice in the explicit rule a.lo.
-  # (The first time if am__fastdepCC is true, the second if it is not.)
-  test 2 = `grep 'am__fastdepCC.*mode=compile --tag=CC' Makefile.in | wc -l`
-fi
-
 $MAKE
 $MAKE distcheck