Re: CVS automake testsuite failures under Tru64 unix

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

[...]

 adl> Now we have a handful of failures due to 

 adl> AC_INIT([[foobar]], [1.0])

 adl> being transformed into

 adl> PACKAGE_NAME='foobar'
 adl> PACKAGE_TARNAME='-foobar-'
 adl> PACKAGE_VERSION='1.0'
 adl> PACKAGE_STRING='foobar 1.0'
 adl> PACKAGE_BUGREPORT=''

 adl> hence the tarball is named `-foobar--1.0.tar.gz' instead 
 adl> of `foobar-1.0.tar.gz'.

 adl> Apart from renaming the problematic test case, the only other
 adl> idea I have is to uses AC_INIT's fourth parameter:

 adl> AC_INIT([[$me]], [1.0], address@hidden, [[$me]])

 adl> this seems to works.  However we would have to raise the
 adl> Autoconf version requirement.

 adl> Another idea?

Given that Autoconf appears to be too sensible in this area
let's simply change `sinclude.test' so that it doesn't use
`sinclude' as package name.

BTW `sinclude' is the obsolete name for `m4_sinclude' so let's
upgrade to this too.

I'm checking in the following.

2002-05-22  Alexandre Duret-Lutz  <address@hidden>

        * 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'.

Index: tests/defs
===================================================================
RCS file: /cvs/automake/automake/tests/defs,v
retrieving revision 1.47
diff -u -r1.47 defs
--- tests/defs  20 May 2002 17:55:48 -0000      1.47
+++ tests/defs  22 May 2002 09:47:59 -0000
@@ -52,11 +52,8 @@
 # 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
Index: tests/sinclude.test
===================================================================
RCS file: /cvs/automake/automake/tests/sinclude.test,v
retrieving revision 1.4
diff -u -r1.4 sinclude.test
--- tests/sinclude.test 21 Oct 2001 18:04:33 -0000      1.4
+++ tests/sinclude.test 22 May 2002 09:47:59 -0000
@@ -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 @@
 : > 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
 
-- 
Alexandre Duret-Lutz