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

diff --git a/ChangeLog b/ChangeLog
index 6bc6e06..65f470b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-01-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * 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  <duret_g@epita.fr>
+
        * 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

diff --git a/tests/dup3.test b/tests/dup3.test
index 11edf29..594b5d0 100755 (executable)
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -14,5 +14,7 @@ cat > zoo/zoo.m4 << 'END'
 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

diff --git a/tests/error.test b/tests/error.test
index a5a9117..8c91829 100755 (executable)
--- a/tests/error.test
+++ b/tests/error.test
@@ -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