From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 1 Apr 2009 18:36:22 +0000 (+0200)
Subject: Fix testsuite failures due to nonexistent `dirlist' entries.
X-Git-Tag: v1.11~32^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371b586076414c1cafce4c66ca80fa7fac313aa0;p=thirdparty%2Fautomake.git

Fix testsuite failures due to nonexistent `dirlist' entries.

* tests/defs.in: When parsing `$aclocaldir/dirlist', only add
existing directories D to aclocal `-I D' flags, as aclocal
errors on nonexisting directories.
Report and analysis by Andreas Schwab.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index e60c688c6..72809f898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix testsuite failures due to nonexistent `dirlist' entries.
+	* tests/defs.in: When parsing `$aclocaldir/dirlist', only add
+	existing directories D to aclocal `-I D' flags, as aclocal
+	errors on nonexisting directories.
+	Report and analysis by Andreas Schwab.
+
 2009-03-31  Akim Demaille  <akim@lrde.epita.fr>
 
 	Fix typo in manual.
diff --git a/tests/defs.in b/tests/defs.in
index aee5dfa52..3193eed6c 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -320,8 +320,8 @@ case $required in
     if test -f $aclocaldir/dirlist; then
        extra_includes=`
        <$aclocaldir/dirlist \
-       sed -ne 's/#.*//;s/[	 ][	 ]*$//g;s/..*/ -I &/p' |
-	 tr -d '\n'`
+       sed  's/#.*//;s/[	 ][	 ]*$//g' \
+       | while read dir; do test ! -d "$dir" || echo "-I $dir"; done`
     else :; fi
 
     libtool_found=no