From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 22 May 2002 09:50:47 +0000 (+0000)
Subject: * tests/defs (confiugre.in): Don't double-quote $me.
X-Git-Tag: Release-1-6b~97
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=f1a5eb72c0c93adb467593dfda3e7340fa5ef1da;p=automake.git

* tests/defs (confiugre.in): Don't double-quote $me.
* tests/sinclude.test: Overwrite configure.in and use
`am__sinclude' instead of `sinclude' as package name.
Excercise `m4_sinclude' instead of `sinclude'.
---

diff --git a/ChangeLog b/ChangeLog
index c8dbd754..9f0bfea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-22  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* tests/defs (confiugre.in): Don't double-quote $me.
+	* tests/sinclude.test: Overwrite configure.in and use
+	`am__sinclude' instead of `sinclude' as package name.
+	Excercise `m4_sinclude' instead of `sinclude'.
+
 2002-05-20  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* automake.in (conditional_implies_one_of): Rename as ...
diff --git a/tests/defs b/tests/defs
index 9413d43b..ef4c1d12 100644
--- a/tests/defs
+++ b/tests/defs
@@ -52,11 +52,8 @@ cd ./testSubDir
 # Don't use AC_OUTPUT, but AC_CONFIG_FILES so that appending
 # still produces a valid configure.ac.  But then, tests running
 # config.status really need to append AC_OUTPUT.
-#
-# Double-quote `$me' in case it is also the name of
-# an M4 macro (such as `sinclude').
 cat > configure.in << END
-AC_INIT([[$me]], [1.0])
+AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
diff --git a/tests/sinclude.test b/tests/sinclude.test
index 0ca04ac6..a26b42eb 100755
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -1,9 +1,18 @@
 #! /bin/sh
 
-# Test to see if `sinclude' works.
+# Test to see if `m4_sinclude' works.
 
 . $srcdir/defs || exit 1
 
+# Overwrite configure.in, because the default uses `sinclude' as package
+# name and this play havoc with Autoconf on some platforms (`sinclude'
+# is an m4 macro).
+cat > configure.in <<EOF
+AC_INIT([am__sinclude], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+EOF
+
 mkdir sub
 cat > sub/p.m4 << 'END'
 AC_SUBST(MAGICALPIG)
@@ -12,7 +21,7 @@ END
 : > Makefile.am
 
 $ACLOCAL || exit 1
-echo 'sinclude(sub/p.m4)' >> aclocal.m4
+echo 'm4_sinclude(sub/p.m4)' >> aclocal.m4
 
 $AUTOMAKE --Wno-error || exit 1