19-fyi-more-traces-and-fixes.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (scan_autoconf_traces): Add support for
        AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, A[CM]_PROG_LIBTOOL,
        AM_CONFIG_HEADER, AM_MAINTAINER_MODE.
        * tests/condincl.test (target): Better pattern, to avoid matching
        the definition of `target_alias' which is now properly discovered
        as an AC_SUBST by traces.
        * cond4.test: Better grep pattern: After all, why shouldn't
        TWO_FALSE be AC_SUBST properly.
        * tests/installsh.test (AUTOMAKE, ACLOCAL): Adjust.

Index: automake.in
--- automake.in Sat, 20 Oct 2001 13:09:54 +0200 akim
+++ automake.in Sat, 20 Oct 2001 13:46:06 +0200 akim
@@ -4445,14 +4445,19 @@ sub scan_autoconf_traces ($)
   my ($filename) = @_;

   my @traced = (
+               'AC_CANONICAL_HOST',
+               'AC_CANONICAL_SYSTEM',
                'AC_CONFIG_AUX_DIR',
                'AC_CONFIG_FILES',
                'AC_LIBSOURCE',
+               'AC_PROG_LIBTOOL', 'AM_PROG_LIBTOOL',
                'AC_SUBST',
                'AM_CONDITIONAL',
+               'AM_CONFIG_HEADER',
                'AM_C_PROTOTYPES',
                'AM_GNU_GETTEXT',
                'AM_INIT_AUTOMAKE',
+               'AM_MAINTAINER_MODE',
                'AM_PROG_CC_C_O',
               );

@@ -4474,7 +4479,16 @@ sub scan_autoconf_traces ($)
       my $here = "$file:$line";

       # Alphabetical ordering please.
-      if ($macro eq 'AC_CONFIG_AUX_DIR')
+      if ($macro eq 'AC_CANONICAL_HOST')
+       {
+         $seen_canonical = $AC_CANONICAL_HOST
+           if ! $seen_canonical;
+       }
+      elsif ($macro eq 'AC_CANONICAL_SYSTEM')
+       {
+         $seen_canonical = $AC_CANONICAL_SYSTEM;
+       }
+      elsif ($macro eq 'AC_CONFIG_AUX_DIR')
        {
          @config_aux_path = $args[1];
          $config_aux_dir_set_in_configure_in = 1;
@@ -4496,10 +4510,33 @@ sub scan_autoconf_traces ($)
        {
          $configure_vars{$args[1]} = $here;
        }
+      elsif ($macro =~ /A(C|M)_PROG_LIBTOOL/)
+       {
+         $seen_libtool = $here;
+         $libtool_line = $line;
+       }
       elsif ($macro eq 'AM_CONDITIONAL')
        {
          $configure_cond{$args[1]} = $here;
        }
+      elsif ($macro eq 'AM_CONFIG_HEADER')
+       {
+         $config_header_line = $.;
+         foreach my $one_hdr (split (' ', $args[1]))
+           {
+             push (@config_fullnames, $one_hdr);
+             if ($one_hdr =~ /^([^:]+):(.+)$/)
+               {
+                 push (@config_names, $1);
+                 push (@config_headers, $2);
+               }
+             else
+               {
+                 push (@config_names, $one_hdr);
+                 push (@config_headers, $one_hdr . '.in');
+               }
+           }
+       }
       elsif ($macro eq 'AM_C_PROTOTYPES')
        {
          $am_c_prototypes = $here;
@@ -4514,6 +4551,10 @@ sub scan_autoconf_traces ($)
          $package_version = $args[2];
          $package_version_line = $line;
          $seen_init_automake = 1;
+       }
+      elsif ($macro eq 'AM_MAINTAINER_MODE')
+       {
+         $seen_maint_mode = $here;
        }
       elsif ($macro eq 'AM_PROG_CC_C_O')
        {
Index: tests/cond4.test
--- tests/cond4.test Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ tests/cond4.test Sat, 20 Oct 2001 13:34:45 +0200 akim
@@ -34,7 +34,9 @@ echo-objects:

 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-test "`grep TWO_FALSE Makefile.in | wc -l`" -eq 0 || exit 1
+
+# We should not output useless definitions.
+test "`grep 'address@hidden@' Makefile.in | wc -l`" -eq 0 || exit 1

 $AUTOCONF || exit 1
 (gcc -v) > /dev/null 2>&1 || exit 77
Index: tests/condincl.test
--- tests/condincl.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/condincl.test Sat, 20 Oct 2001 13:36:17 +0200 akim
@@ -22,8 +22,8 @@ target: dependency
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1

-grep '^target' Makefile.in && exit 1
+grep '^target:' Makefile.in && exit 1

-grep 'address@hidden@target' Makefile.in || exit 1
+grep 'address@hidden@target:' Makefile.in || exit 1

 exit 0
Index: tests/installsh.test
--- tests/installsh.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/installsh.test Sat, 20 Oct 2001 13:52:35 +0200 akim
@@ -25,7 +25,8 @@
     ;;
 esac

-AUTOMAKE="$PERL ../../../automake --libdir=$srcdir/../lib --foreign"
+AUTOMAKE="$PERL ../../../automake --libdir=$srcdir/../lib --foreign --Werror"
+ACLOCAL="$PERL ../../../aclocal --acdir=$srcdir/../m4"

 # Now we proceed with the test
 $ACLOCAL || exit 1