From a5062ef4d7b65807bc0dea406e2e7807d83c6a3b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 19 Mar 2012 09:07:55 +0100
Subject: [PATCH] tests: fix spurious failures caused by uses of 'configure.in'

Issue introduced by the recent merges of maint into master, and
revealed by "make maintainer-check".

* tests/aclocal-install-fail.test: Likewise.
* tests/aclocal-install-mkdir.test: Likewise.
* tests/aclocal-verbose-install.test: Likewise.
* tests/installdir.test: Likewise.
* tests/instdir-cond2.test: Likewise.
* tests/instdir-no-empty.test: Likewise.
* tests/python-pr10995.test: Likewise.
* tests/aclocal-no-install-no-mkdir.test: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 tests/aclocal-install-fail.test        | 2 +-
 tests/aclocal-install-mkdir.test       | 2 +-
 tests/aclocal-no-install-no-mkdir.test | 2 +-
 tests/aclocal-verbose-install.test     | 2 +-
 tests/installdir.test                  | 2 +-
 tests/instdir-cond2.test               | 2 +-
 tests/instdir-no-empty.test            | 2 +-
 tests/python-pr10995.test              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/aclocal-install-fail.test b/tests/aclocal-install-fail.test
index cf493aa..c458239 100755
--- a/tests/aclocal-install-fail.test
+++ b/tests/aclocal-install-fail.test
@@ -23,7 +23,7 @@ required=ro-dir
 
 set -e
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
 END
diff --git a/tests/aclocal-install-mkdir.test b/tests/aclocal-install-mkdir.test
index 54e97ab..71d09af 100755
--- a/tests/aclocal-install-mkdir.test
+++ b/tests/aclocal-install-mkdir.test
@@ -23,7 +23,7 @@ am_create_testdir=empty
 
 set -e
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
 END
diff --git a/tests/aclocal-no-install-no-mkdir.test b/tests/aclocal-no-install-no-mkdir.test
index 73a6116..728e70a 100755
--- a/tests/aclocal-no-install-no-mkdir.test
+++ b/tests/aclocal-no-install-no-mkdir.test
@@ -22,7 +22,7 @@ am_create_testdir=empty
 
 set -e
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO
 END
diff --git a/tests/aclocal-verbose-install.test b/tests/aclocal-verbose-install.test
index 589d540..d854719 100755
--- a/tests/aclocal-verbose-install.test
+++ b/tests/aclocal-verbose-install.test
@@ -21,7 +21,7 @@ am_create_testdir=empty
 
 set -e
 
-cat > configure.in <<END
+cat > configure.ac <<END
 AC_INIT([$me], [1.0])
 MY_MACRO_BAR
 MY_MACRO_QUUX
diff --git a/tests/installdir.test b/tests/installdir.test
index 1147ee7..dc83ee3 100755
--- a/tests/installdir.test
+++ b/tests/installdir.test
@@ -24,7 +24,7 @@
 
 . ./defs || Exit 1
 
-echo AC_OUTPUT >> configure.in
+echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am << 'END'
 foodir = $(datadir)/$(distdir)
diff --git a/tests/instdir-cond2.test b/tests/instdir-cond2.test
index a2c07d7..1fc24b7 100644
--- a/tests/instdir-cond2.test
+++ b/tests/instdir-cond2.test
@@ -23,7 +23,7 @@
 
 . ./defs || Exit 1
 
-cat >> configure.in << 'END'
+cat >> configure.ac << 'END'
 AM_CONDITIONAL([ENABLE_FOO], [false])
 AC_OUTPUT
 END
diff --git a/tests/instdir-no-empty.test b/tests/instdir-no-empty.test
index cf57996..9251b13 100755
--- a/tests/instdir-no-empty.test
+++ b/tests/instdir-no-empty.test
@@ -21,7 +21,7 @@
 
 set -e
 
-cat >> configure.in <<END
+cat >> configure.ac <<'END'
 AC_SUBST([CC], [whatever])
 AC_SUBST([JAVAC], [whatever])
 AM_PATH_PYTHON(,,:)
diff --git a/tests/python-pr10995.test b/tests/python-pr10995.test
index 1b94cf9..b21d38f 100755
--- a/tests/python-pr10995.test
+++ b/tests/python-pr10995.test
@@ -23,7 +23,7 @@ required=python
 
 set -e
 
-cat >>configure.in <<'EOF'
+cat >> configure.ac <<'EOF'
 AM_PATH_PYTHON
 AC_OUTPUT
 EOF
-- 
2.7.4