+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 ...
# 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
#! /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)
: > 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