From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 26 Nov 2001 18:02:41 +0000 (+0000)
Subject: * tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
X-Git-Tag: Release-1-5b~13
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3cf5a532840a61ef6b9bf2fc5e5f90e5f23a6e0e;p=automake.git

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

diff --git a/ChangeLog b/ChangeLog
index 246d7701..31eeebbe 100644
--- 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 a63e442a..6e7e1600 100644
--- 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