[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
defs-aclocal.patch
From: |
Alexandre Duret-Lutz |
Subject: |
defs-aclocal.patch |
Date: |
25 Nov 2001 22:13:39 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 |
FAIL: ldflags.test
FAIL: libtool2.test
FAIL: listval.test
FAIL: ltdeps.test
FAIL: ltlibobjs.test
I can see these failures on a host where Automake 1.4 is
installed in the same $prefix as Gettext and Libtool.
That's because when either gettext or libtool is required, the
m4 files from the old Automake are used instead of those of
Automake 1.5a...
Index: ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,1 +1,6 @@
+2001-11-25 Alexandre Duret-Lutz <address@hidden>
+
+ * tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
+ directory.
+
Index: tests/defs
===================================================================
RCS file: /home/adl/CVSROOT/automake-20011123-1047/tests/defs,v
retrieving revision 1.1
diff -u -r1.1 defs
--- tests/defs 23 Nov 2001 09:48:04 -0000 1.1
+++ tests/defs 25 Nov 2001 21:09:09 -0000
@@ -111,14 +111,17 @@
# 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
--
Alexandre Duret-Lutz
- defs-aclocal.patch,
Alexandre Duret-Lutz <=