From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 20 Apr 2010 19:02:15 +0000 (+0200)
Subject: Make test for configure.in vs. configure.ac stricter.
X-Git-Tag: v1.11.1b~85^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4da4ff7c1791c0113ced4c47cb8457a38f7c6a38;p=thirdparty%2Fautomake.git

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 9fd00dc25..d94ee8f1c 100644
--- 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 4b0f28df6..50a034f0a 100755
--- 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; }