summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xtests/configure.test7
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a33a676d..64c2e59da 100644
--- 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 50a034f0a..f7ee977cc 100755
--- 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; }