do not allow stamp-h in AC_OUTPUT

diff --git a/ChangeLog b/ChangeLog
index b4c2460611683a10181c1ab93b6f61b0699641f4..97a4e0d424faaa7b7c60359308df1c447d826111 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 28 23:34:49 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_configure): Error if stamp-h appears in
+       AC_OUTPUT line.
+
 Thu Mar 27 17:28:47 1997  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_dist_worker): Avoid automake rules in

diff --git a/automake.in b/automake.in
index 1f786e1eb3464d8e5575585a09aac2d2ff2d0988..469c7a045efb7efd028dd8537b2f616e8ee19555 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2853,6 +2853,17 @@ sub handle_configure
        # Skip any Makefile.
        next if $local eq 'Makefile';
 
+       # Some users might be tempted to put `stamp-h' in the
+       # AC_OUTPUT line.  This won't do the right thing, so we
+       # explicitly fail here.
+       if ($local eq 'stamp-h')
+       {
+           # FIXME: allow real filename.
+           &am_conf_error ('configure.in', $ac_output_line,
+                           'stamp-h should not appear in AC_OUTPUT');
+           next;
+       }
+
        $output_rules .= ($local . ': '
                          . '$(top_builddir)/config.status '
                          . join (' ', @rewritten_inputs) . "\n"

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 77e7e3eaff6c4b69e8f0b2b7b9f1a2c6dd2771b6..9b2365988a9f0cfb01b217b2338997fb284589bd 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 28 23:36:04 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * stamph.test: New file.
+
 Thu Mar 27 18:10:47 1997  Tom Tromey  <tromey@cygnus.com>
 
        * lisp.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5cc29044463db117d14f0c2f9671c928bd579c4f..7fff1693e1be98301d450c8bd80938be102624b7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
-cxxlibobj.test seenc.test cygwin32.test lisp.test
+cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 53128fe0fc9295974cced439abc073786777f2db..8d3f401d5f1c0686b343d88eed5f509af7d6fab2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -78,7 +78,7 @@ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test        \
-cxxlibobj.test seenc.test cygwin32.test lisp.test
+cxxlibobj.test seenc.test cygwin32.test lisp.test stamph.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/stamph.test b/tests/stamph.test
new file mode 100755 (executable)
index 0000000..2152393
--- /dev/null
+++ b/tests/stamph.test
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+# Error if stamp-h appears in AC_OUTPUT line.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AM_PROG_INSTALL
+AC_OUTPUT(Makefile stamp-h)
+END
+
+: > Makefile.am
+
+$AUTOMAKE && exit 1
+exit 0