Make test for configure.in vs. configure.ac stricter.

* tests/configure.test: Use a configure.in file that provokes
an automake error, to ensure configure.ac is preferred.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 9a33a676de669e9b4925c46589ad8d9355527fff..64c2e59dae671de5feae39fc22e5191531fdf5e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       Make test for configure.in vs. configure.ac stricter.
+       * tests/configure.test: Use a configure.in file that provokes
+       an automake error, to ensure configure.ac is preferred.
+
        Avoid possible false negatives in dejagnu7.test.
        * tests/dejagnu7.test: Enable shell `errexit' flag.  Also, avoid
        unportable use of fgrep option `-e'.

diff --git a/tests/configure.test b/tests/configure.test
index 50a034f0a9a42ab4a719a9c6cbd21f159ab4c616..f7ee977cc41dbe80c7b439686586701efc948096 100755 (executable)
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -35,6 +35,13 @@ AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 EOF
 
+cat >configure.in <<EOF
+AC_INIT([configure], [1.0])
+AM_INIT_AUTOMAKE([an-invalid-automake-option])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+EOF
+
 : >Makefile.am
 
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }