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 9fd00dc25c36694fadb612a74231b6ef0617b48e..d94ee8f1cfb623676f31f5c6f6d5a925547ca700 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-20  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.
+
        Use `set -e' in confsub.test (avoids possible false negatives).
        * tests/confsub.test: Enable shell `errexit' flag, and related
        changes (this helps avoiding some possible minor false negatives).

diff --git a/tests/configure.test b/tests/configure.test
index 4b0f28df6222def7f99e8fb7f7b96f538ab5e71e..50a034f0a9a42ab4a719a9c6cbd21f159ab4c616 100755 (executable)
--- a/tests/configure.test
+++ b/tests/configure.test
@@ -28,6 +28,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; }