diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2002-07-31 19:58:26 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2002-07-31 19:58:26 +0000 |
| commit | 0b7fbfaaf2f725be356577a812ed34dee5fdaa9c (patch) | |
| tree | 15f0830bc6f8c3d42755badf8e93d7b1c7a1533c /tests/defs | |
| parent | 675e25d14f4e15adaff34897ad2d0858505b10fc (diff) | |
| download | automake-0b7fbfaaf2f725be356577a812ed34dee5fdaa9c.tar.gz | |
2002-07-31 Charles Wilson <cwilson@ece.gatech.edu>
* aclocal.in (parse_arguments): Add support for extending
default macro search path, using a `dirlist' file within
the aclocal directory.
* automake.texi (Invoking aclocal): Move option descriptions into ...
(aclocal options): ... this new node.
(Macro search path): New node.
* tests/dirlist.test: New file.
* tests/Makefile.am (TESTS): Add dirlist.test.
* m4/dirlist: New file.
* m4/Makefile.am (EXTRA_DIST): Add dirlist.
* tests/defs: Honor any installed dirlist when searching for
libtool.m4 and gettext.m4.
Diffstat (limited to 'tests/defs')
| -rw-r--r-- | tests/defs | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tests/defs b/tests/defs index 5127d01b6..631504099 100644 --- a/tests/defs +++ b/tests/defs @@ -144,14 +144,34 @@ fi # 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` +extra_includes="" +if [ -f $aclocaldir/dirlist ] ; then + extra_includes=`(tmp_inc="" + while read LINE ; do + tmp_inc="$tmp_inc -I $LINE" + done + echo $tmp_inc) < $aclocaldir/dirlist` +fi case $required in *libtool* ) - test -f "$aclocaldir/libtool.m4" || exit 77 - ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir" + libtool_found=no + for d in $extra_includes $aclocaldir ; do + if [ "x$d" != "x-I" ] && [ -f "$d/libtool.m4" ] ; then + libtool_found=yes + fi + done + test "x$libtool_found" = "xyes" || exit 77 + ACLOCAL="$ACLOCAL -I $srcdir/../m4 $extra_includes -I $aclocaldir" ;; *gettext* ) - test -f "$aclocaldir/gettext.m4" || exit 77 - ACLOCAL="$ACLOCAL -I $srcdir/../m4 -I $aclocaldir" + gettext_found=no + for d in $extra_includes $aclocaldir ; do + if [ "x$d" != "x-I" ] && [ -f "$d/gettext.m4" ] ; then + gettext_found=yes + fi + done + test "x$gettext_found" = "xyes" || exit 77 + ACLOCAL="$ACLOCAL -I $srcdir/../m4 $extra_includes -I $aclocaldir" ;; esac |