* 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 c8dbd754c53d2569a24aa640c1f653ee42734f51..9f0bfea027cb0578028a08237f0e1d364a07be32 100644 (file)
--- 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 9413d43be1ff6579b99c548e1be12607c74ed2a4..ef4c1d12257a8f2e46cc4c2f0855c4ff9f20992a 100644 (file)
--- 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 0ca04ac6c36e204e6c096e68eee4fa3899e88c1b..a26b42ebd4f146f30c8eee6f0d688728b6fd8556 100755 (executable)
--- 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