Bug fix

diff --git a/ChangeLog b/ChangeLog
index 7f0363c..64cd0da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Dec  1 15:08:09 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_configure): Correctly handle common case of
+       multiple non-Makefiles in AC_OUTPUT.  Require all input files when
+       using ":" syntax.
+
 Sun Nov 24 00:33:50 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_source_transform): Don't define

diff --git a/Makefile.in b/Makefile.in
index e7cd527..e1b24c7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,10 +78,10 @@ TEXINFOS = automake.texi
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README README-alpha THANKS TODO aclocal.m4 ansi2knr.1 \
-ansi2knr.c automake.in config.guess config.sub configure configure.in \
-elisp-comp install-sh interlock mdate-sh mkinstalldirs stamp-vti \
-texinfo.tex version.texi ylwrap
+Makefile.in NEWS README README-alpha THANKS TODO aclocal.in aclocal.m4 \
+ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
+configure.in elisp-comp install-sh interlock mdate-sh mkinstalldirs \
+stamp-vti texinfo.tex version.texi ylwrap
 
 
 PACKAGE = @PACKAGE@
@@ -111,7 +111,7 @@ $(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && autoconf
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-aclocal: $(top_builddir)/config.status automake.in aclocal.in
+aclocal: $(top_builddir)/config.status aclocal.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)

diff --git a/automake.in b/automake.in
index 3d98e8d..4b7ca5f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2403,7 +2403,7 @@ sub handle_configure
        else
        {
            # Normal usage.
-           push (@inputs, $local . '.in');
+           @inputs = $local . '.in';
        }
        # FIXME: when using autoconf ":" syntax, should we set CONFIG_FILES
        # to $local:$input?
@@ -2417,8 +2417,9 @@ sub handle_configure
                          . "\n");
        push (@actual_other_files, $local);
 
+       # Require all input files.
        &require_file_with_conf_line ($ac_output_line, $FOREIGN,
-                                     $inputs[0]);
+                                     @inputs);
     }
 
     # These files get removed by "make clean".