defs-check-m4.patch

[Alexandre Duret-Lutz]

subdircond.test fails for me because aclocal doesn't find
AM_GNU_GETTEXT.

I have the following setup.

# Latest released versions:
/usr/bin/{gettext,autoconf,automake,aclocal}
/usr/share/aclocal/{gettext.m4,init.m4,...}
# CVS versions:
$HOME/usr/bin/{autoconf,automake,aclocal}
$HOME/usr/share/aclocal/{init.m4,...}

PATH="$HOME/usr/bin:/usr/bin"


When `tests/defs' finds `gettext' in PATH, it assumes that
`aclocal --print-ac-dir' will output the directory where
`gettext.m4' is installed.  Alas, it's not true here.

Index: ChangeLog
--- ChangeLog
+++ ChangeLog
@@ -1,1 +1,6 @@
+2001-11-16  Alexandre Duret-Lutz  <address@hidden>
+
+       * tests/defs (aclocaldir): Check for existence of libtool.m4 and
+       gettext.m4 if required.
+

Index: tests/defs
===================================================================
RCS file: /cvs/automake/automake/tests/defs,v
retrieving revision 1.37
diff -u -r1.37 defs
--- tests/defs 2001/10/21 18:05:22 1.37
+++ tests/defs 2001/11/16 11:17:11
@@ -113,7 +113,12 @@
 # Find them on the system.
 aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null`
 case $required in
-  *libtool* | *gettext* )
+  *libtool* )
+    test -f "$aclocaldir/libtool.m4" || exit 77
+    ACLOCAL="$ACLOCAL -I $aclocaldir"
+    ;;
+  *gettext* )
+    test -f "$aclocaldir/gettext.m4" || exit 77
     ACLOCAL="$ACLOCAL -I $aclocaldir"
     ;;
 esac

-- 
Alexandre Duret-Lutz