bug fix from Ulrich

diff --git a/ChangeLog b/ChangeLog
index f6cc871..2bcd390 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  6 18:54:10 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_configure): Require actual input files, not
+       rewritten input files.  From Ulrich Drepper.
+
 Thu Dec  5 02:52:20 1996  Tom Tromey  <tromey@cygnus.com>
 
        Suggestion from Mark Galassi:

diff --git a/TODO b/TODO
index f4dee55..5414716 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,6 +6,10 @@ Priorities for release:
 * `missing' program
 * copyrights on m4 files, aclocal output
 
+For now I guess I'll just have automake give an error if it encounters
+non-C source in a libtool library specification.
+
+
 * must split $obj into two parts: one for libtool and one for
   deansification.  Otherwise .S files will be deansified!
 

diff --git a/automake.in b/automake.in
index 11d8b73..0f767a4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2472,7 +2472,7 @@ sub handle_configure
     # by config.status, and generate rules for them.
     local (@actual_other_files) = ();
     local ($file, $local);
-    local (@inputs, $single);
+    local (@inputs, @rewritten_inputs, $single);
     foreach $file (@other_input_files)
     {
        if ($file =~ /^(.*):(.*)$/)
@@ -2498,16 +2498,16 @@ sub handle_configure
        # Skip any Makefile.
        next if $local eq 'Makefile';
 
-       @inputs = &rewrite_inputs_into_dependencies (@inputs);
+       @rewritten_inputs = &rewrite_inputs_into_dependencies (@inputs);
 
        $output_rules .= ($local . ': '
                          . '$(top_builddir)/config.status '
-                         . join (' ', @inputs) . "\n"
+                         . join (' ', @rewritten_inputs) . "\n"
                          . "\t"
                          . 'cd $(top_builddir) && CONFIG_FILES='
                          . ($relative_dir eq '.' ? '' : '$(subdir)/')
                          . '$@' . (length (@inputs) > 1
-                                   ? (':' . join (':', @inputs))
+                                   ? (':' . join (':', @rewritten_inputs))
                                    : '')
                          . ' CONFIG_HEADERS= ./config.status'
                          . "\n");

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 97b716b..96c1d07 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec  6 19:00:31 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * output.test: New file.
+
 Thu Dec  5 18:23:17 1996  Tom Tromey  <tromey@cygnus.com>
 
        * remake.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 372d6f4..0dfbd9e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +19,7 @@ confsub.test primary.test primary2.test depend2.test spell3.test \
 comment2.test vpath.test symlink.test discover.test acinclude.test req.test \
 acsilent.test distdir.test lex2.test libobj4.test libobj5.test version.test \
 ranlib.test confvar.test confvar2.test stdlib.test cxxo.test colon2.test \
-colon3.test remake.test
+colon3.test remake.test output.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/output.test b/tests/output.test
new file mode 100755 (executable)
index 0000000..dfb609c
--- /dev/null
+++ b/tests/output.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Test to make sure files listed in AC_OUTPUT are found.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile frob/zardoz)
+END
+
+: > Makefile.am
+
+mkdir frob
+: > frob/zardoz.in
+
+$AUTOMAKE