Re: FYI: Re: aclocal.m4-version-check.patch

[Alexandre Duret-Lutz]

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

 adl> (I'm not really proud of the the $ACLOCAL definition in test/defs.)

This new definition causes `dup3.test' and `error.test' to fail
when $srcdir = "." (Murphy's law: I was doing `make check' in
VPATH these days.)

I'm checking in the following changes.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1718
diff -u -r1.1718 ChangeLog
--- ChangeLog   2002/01/09 08:52:03     1.1718
+++ ChangeLog   2002/01/09 10:22:21
@@ -1,5 +1,11 @@
 2002-01-09  Alexandre Duret-Lutz  <address@hidden>
 
+       * tests/dup3.test: Remove all -I from $ACLOCAL before using it.
+       * tests/error.test: Use some macro names which are not defined by
+       Automake itself.
+
+2002-01-09  Alexandre Duret-Lutz  <address@hidden>
+
        * automake.texi (Complete, Macros, Options): Document the new style
        AM_INIT_AUTOMAKE.  Remove AM_AUTOMAKE_OPTIONS documentaion.
        * m4/init.m4 (AM_INIT_AUTOMAKE): Get PACKAGE and VERSION from
Index: tests/dup3.test
===================================================================
RCS file: /cvs/automake/automake/tests/dup3.test,v
retrieving revision 1.2
diff -u -r1.2 dup3.test
--- dup3.test   2001/10/20 11:15:35     1.2
+++ dup3.test   2002/01/09 10:22:21
@@ -14,5 +14,7 @@
 AC_DEFUN([AM_INIT_AUTOMAKE], zardoz)
 END
 
+# Strip all options from ACLOCAL, especially -I's.
+ACLOCAL="`echo $ACLOCAL | sed -e 's/ -.*$//'` --acdir=$srcdir/../m4"
 $ACLOCAL -I zoo || exit 1
 fgrep zardoz aclocal.m4
Index: tests/error.test
===================================================================
RCS file: /cvs/automake/automake/tests/error.test,v
retrieving revision 1.3
diff -u -r1.3 error.test
--- error.test  1996/10/06 03:55:54     1.3
+++ error.test  2002/01/09 10:22:21
@@ -5,16 +5,15 @@
 . $srcdir/defs || exit 1
 
 cat > configure.in << 'END'
-AM_C_PROTOTYPES
+AM_ONE_MACRO
 END
 
-# Set up a strange environment, where AM_C_PROTOTYPES exists but its
+# Set up a strange environment, where AM_ONE_MACRO exists but its
 # dependency does not.
-cat > AM_C_PROTOTYPES.m4 << 'END'
-AC_DEFUN(AM_C_PROTOTYPES,
-AC_REQUIRE([AM_PROG_CC_STDC]))
+cat > AM_ONE_MACRO.m4 << 'END'
+AC_DEFUN([AM_ONE_MACRO],
+[AC_REQUIRE([AM_UNEXISING_MACRO])])
 END
 
-# Our --acdir overrides the one in $ACLOCAL.
-$ACLOCAL --acdir=. && exit 1
+$ACLOCAL && exit 1
 exit 0

-- 
Alexandre Duret-Lutz