fixes for new autoconf

diff --git a/ChangeLog b/ChangeLog
index 662f62d3f25de72bb035287da13af916a3db9059..6f55c82209932160fb0c8125b26b89e9b21f8e45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Thu Nov 21 22:29:30 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (scan_configure): AC_FUNC_FNMATCH doesn't add to
+       LIBOBJS.
+       (handle_configure): Support multi-":" mode for AC_OUTPUT.
+
        * m4/header.m4: New file.
 
        * automake.in (scan_configure): Recognize AM_CONFIG_HEADER.

diff --git a/automake.in b/automake.in
index cc8cbd41265594818fee823d76a0822f7c19965b..aca276e2aeef117bf97cd2d87185b37d7d57b793 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2317,7 +2317,8 @@ sub handle_configure
     # Now look for other files in this directory which must be remade
     # by config.status, and generate rules for them.
     local (@actual_other_files) = ();
-    local ($file, $local, $input);
+    local ($file, $local);
+    local (@inputs);
     foreach $file (@other_input_files)
     {
        # Skip files not in this directory, any Makefile, and the
@@ -2330,18 +2331,19 @@ sub handle_configure
        if ($local =~ /^(.*):(.*)$/)
        {
            # This is the ":" syntax of AC_OUTPUT.
-           $input = $2;
+           @inputs = split (':', $2)
            $local = $1;
        }
        else
        {
            # Normal usage.
-           $input = $local . '.in';
+           push (@inputs, $local . '.in');
        }
        # FIXME: when using autoconf ":" syntax, should we set CONFIG_FILES
        # to $local:$input?
        $output_rules .= ($local . ': '
-                         . '$(top_builddir)/config.status ' . $input . "\n"
+                         . '$(top_builddir)/config.status '
+                         . join (' ', @inputs) . "\n"
                          . "\t"
                          . 'cd $(top_builddir) && CONFIG_FILES='
                          . ($relative_dir eq '.' ? '' : '$(subdir)/')