* automake.in (handle_dist): Always include configure.in and

	configure in distribution.  Fixes confdist.test.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8883abcf4..6fcf91662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 1998-10-08  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (handle_dist): Always include configure.in and
+	configure in distribution.  Fixes confdist.test.
+
 	* automake.in (do_one_merge_target): Be silent when running
-	install-exec-am and install-data-am.
+	install-exec-am and install-data-am.  Fixes extra3.test and
+	extra4.test.
 
 1998-10-07  Tom Tromey  <tromey@cygnus.com>
 
diff --git a/automake.in b/automake.in
index f3663a454..ebe79d88d 100755
--- a/automake.in
+++ b/automake.in
@@ -2433,6 +2433,13 @@ sub handle_dist
 	}
     }
 
+    # Always require configure.in and configure at top level, even if
+    # they don't exist.  This is especially important for configure,
+    # since it won't be created until autoconf is run -- which might
+    # be after automake is run.
+    &push_dist_common ('configure.in', 'configure')
+	if $relative_dir eq '.';
+
     # Keys of %dist_common are names of files to distributed.  We put
     # README first because it then becomes easier to make a
     # Usenet-compliant shar file (in these, README must be first).