16-maintainer-fixes.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in: maintainer-check fixes.
        
        
Index: automake.in
--- automake.in Wed, 31 Jan 2001 01:43:58 +0100 akim (am/f/39_automake.i 1.21 
755)
+++ automake.in Wed, 31 Jan 2001 01:45:16 +0100 akim (am/f/39_automake.i 1.21 
755)
@@ -4343,11 +4343,11 @@ sub scan_autoconf_traces
         if ($macro eq 'AC_CONFIG_FILES')
        {
            # Look at potential Makefile.am's.
-           &scan_autoconf_config_files (@args[0]);
+           &scan_autoconf_config_files ($args[0]);
        }
         elsif ($macro eq '_AC_LIBOBJ_DECL')
        {
-           local ($source) = "@args[0].c";
+           local ($source) = "$args[0].c";
            # We should actually also `close' the sources: getopt.c
            # wants getopt.h etc.  But actually it should be done in the
            # macro itself, i.e., we have to first fix Autoconf to extend
@@ -4360,10 +4360,10 @@ sub scan_autoconf_traces
        }
         elsif ($macro eq 'AC_SUBST')
        {
-           if (!defined address@hidden)
+           if (!defined $configure_vars{$args[0]})
                {
-                   print STDERR "traces: discovered AC_SUBST(@args[0])\n";
-                   address@hidden = $here;
+                   print STDERR "traces: discovered AC_SUBST($args[0])\n";
+                   $configure_vars{$args[0]} = $here;
                }
        }
     }
@@ -7080,7 +7080,7 @@ sub file_contents
        else
        {
            # This isn't an error; it is probably some tokens which
-           # configure is supposed to replace, such as address@hidden@'.
+           # configure is supposed to replace, such as address@hidden@'.
            $result_rules .= "$comment$separator$_\n";
            $comment = $separator = '';
        }