* tests/aclocal6.test: Check for autom4te.cache only if it has

been created.
* tests/maintclean.test: Update comment.
Report from Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index 2948533..c6e28c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-15  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/aclocal6.test: Check for autom4te.cache only if it has
+       been created.
+       * tests/maintclean.test: Update comment.
+       Report from Bruno Haible.
+
        * tests/txinfo24.test, tests/txinfo25.test, tests/txinfo28.test:
        Require texi2dvi-o.
        Report from Václav Haisman.

diff --git a/tests/aclocal6.test b/tests/aclocal6.test
index f05bd8e..f3ee3a9 100755 (executable)
--- a/tests/aclocal6.test
+++ b/tests/aclocal6.test
@@ -48,6 +48,13 @@ $ACLOCAL -I m4
 $AUTOCONF
 $AUTOMAKE --copy --add-missing
 
+# Users can disable autom4te.cache.
+if test -d autom4te.cache; then
+  test_cache='test -d'
+else
+  test_cache=:
+fi
+
 mkdir build
 cd build
 
@@ -79,7 +86,7 @@ test -f aclocal6-1.0/acinclude.m4
 # Make sure maintainer-clean works in VPATH builds.
 # (This is unrelated to the rest of this test.)
 $MAKE clean
-test -d ../autom4te.cache
+$test_cache ../autom4te.cache
 test -f Makefile
 test -f sub/Makefile
 $MAKE maintainer-clean

diff --git a/tests/maintclean.test b/tests/maintclean.test
index a40088e..87ebc0d 100755 (executable)
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -45,7 +45,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
 
-# autom4te.cache appears with Autoconf >= 2.53.
+# Users can disable autom4te.cache.
 if test -d autom4te.cache; then
   test_cache='test -d autom4te.cache'
 else