* automake.in (&scan_autoconf_traces): Add support for

AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and
AC_CONFIG_AUX_DIR.
* tests/alpha.test (configure.in): Automake wants a Makefile.

diff --git a/ChangeLog b/ChangeLog
index 25a8a17bbcbe9e55f18df5aca02fda1898778661..afd48784852adca481340ec33d87117ae52b8e8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-20  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&scan_autoconf_traces): Add support for
+       AM_C_PROTOTYPES, AM_GNU_GETTEXT, AM_PROG_CC_C_O, and
+       AC_CONFIG_AUX_DIR.
+       * tests/alpha.test (configure.in): Automake wants a Makefile.
+
+       
 2001-10-20  Akim Demaille  <akim@epita.fr>
 
        * automake.in (scan_autoconf_traces): Use an unlikely to be used

diff --git a/automake.in b/automake.in
index e16735d34f679a34a609c56f96ba5bb5e78d7fb1..2f34943e59c4191c48afad6c339d8f2aee258b9f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4444,8 +4444,17 @@ sub scan_autoconf_traces ($)
 {
   my ($filename) = @_;
 
-  my @traced = ('AC_CONFIG_FILES', 'AC_LIBSOURCE', 'AC_SUBST',
-               'AM_CONDITIONAL', 'AM_INIT_AUTOMAKE');
+  my @traced = (
+               'AC_CONFIG_AUX_DIR',
+               'AC_CONFIG_FILES',
+               'AC_LIBSOURCE',
+               'AC_SUBST',
+               'AM_CONDITIONAL',
+               'AM_C_PROTOTYPES',
+               'AM_GNU_GETTEXT',
+               'AM_INIT_AUTOMAKE',
+               'AM_PROG_CC_C_O',
+              );
 
   my $traces = "$ENV{amtraces} ";
 
@@ -4465,7 +4474,12 @@ sub scan_autoconf_traces ($)
       my $here = "$file:$line";
 
       # Alphabetical ordering please.
-      if ($macro eq 'AC_CONFIG_FILES')
+      if ($macro eq 'AC_CONFIG_AUX_DIR')
+       {
+         @config_aux_path = $args[1];
+         $config_aux_dir_set_in_configure_in = 1;
+       }
+      elsif ($macro eq 'AC_CONFIG_FILES')
        {
          # Look at potential Makefile.am's.
          &scan_autoconf_config_files ($args[1]);
@@ -4486,12 +4500,25 @@ sub scan_autoconf_traces ($)
        {
          $configure_cond{$args[1]} = $here;
        }
+      elsif ($macro eq 'AM_C_PROTOTYPES')
+       {
+         $am_c_prototypes = $here;
+       }
+      elsif ($macro eq 'AM_GNU_GETTEXT')
+       {
+         $seen_gettext = $here;
+         $ac_gettext_line = $line;
+       }
       elsif ($macro eq 'AM_INIT_AUTOMAKE')
        {
          $package_version = $args[2];
-         $package_version_line = $.;
+         $package_version_line = $line;
          $seen_init_automake = 1;
        }
+      elsif ($macro eq 'AM_PROG_CC_C_O')
+       {
+         $seen_cc_c_o = $here;
+       }
     }
 }
 

diff --git a/tests/alpha.test b/tests/alpha.test
index d24ada47e99892cbe4c0cedde9be166fcfb8c141..829217d3efa35ad89cd78ce6c9c13a6b0faf5efe 100755 (executable)
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -7,6 +7,7 @@
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(zardoz, 1.5e)
+AC_CONFIG_FILES(Makefile)
 END
 
 cat > Makefile.am << 'END'