FYI: trace LT_SUPPORTED_TAGS instead of AC_LIBTOOL_TAGS

[Alexandre Duret-Lutz]

I'm checking this in.

2004-05-22  Alexandre Duret-Lutz  <address@hidden>

        * 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.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1562
diff -u -r1.1562 automake.in
--- automake.in 22 May 2004 14:23:53 -0000      1.1562
+++ automake.in 22 May 2004 21:53:56 -0000
@@ -4626,7 +4626,6 @@
                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 @@
                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 @@
        {
          $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 @@
                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.
Index: tests/libtool3.test
===================================================================
RCS file: /cvs/automake/automake/tests/libtool3.test,v
retrieving revision 1.6
diff -u -r1.6 libtool3.test
--- tests/libtool3.test 7 Jan 2004 21:56:49 -0000       1.6
+++ tests/libtool3.test 22 May 2004 21:53:58 -0000
@@ -89,14 +89,5 @@
 
 ./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

-- 
Alexandre Duret-Lutz