* tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other

directory.

diff --git a/ChangeLog b/ChangeLog
index 246d7701b4314fd8453e24ee89f56efc5d784f3f..31eeebbe7bf867c647ec1aa03aa800fa40c5618a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
+       directory.
+
 2001-11-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/tags.am (TAGS): Search %CONFIG% and $(LISP) files

diff --git a/tests/defs b/tests/defs
index a63e442a21bfc11f9965b5a1396718d231886ac6..6e7e16008b8c4f1f158f717e3eb74d095d94bb36 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -111,14 +111,17 @@ fi
 
 # We might need extra macros, e.g., from Libtool or Gettext.
 # Find them on the system.
+# Use `-I $srcdir/../m4' in addition to `--acdir', because the
+# other `-I' directories added for libtool and gettext might contain
+# files from an old version of Automake that we don't want to use.
 aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null`
 case $required in
   *libtool* )
     test -f "$aclocaldir/libtool.m4" || exit 77
-    ACLOCAL="$ACLOCAL -I $aclocaldir"
+    ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir"
     ;;
   *gettext* )
     test -f "$aclocaldir/gettext.m4" || exit 77
-    ACLOCAL="$ACLOCAL -I $aclocaldir"
+    ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir"
     ;;
 esac