From: Akim Demaille <akim@lrde.epita.fr>
Date: Sat, 24 Nov 2007 14:02:41 +0000 (+0100)
Subject: Skip comments and empty lines in dirlist in the tests.
X-Git-Tag: v1.10b~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7aee991634ac47e207fe54730afaa1b67dd2dc;p=thirdparty%2Fautomake.git

Skip comments and empty lines in dirlist in the tests.

	* defs.in (extra_includes): Skip comments and empty lines in dirlist.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
---

diff --git a/ChangeLog b/ChangeLog
index a9c28e48a..12fc56882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-24  Akim Demaille  <akim@lrde.epita.fr>
+
+	Skip comments and empty lines in dirlist in the tests.
+	* defs.in (extra_includes): Skip comments and empty lines in dirlist.
+
 2007-11-24  Akim Demaille  <akim@lrde.epita.fr>
 
 	Ternary operator in lib/am files.
diff --git a/tests/defs.in b/tests/defs.in
index d79d874e6..107bfe8f4 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -299,11 +299,10 @@ case $required in
     aclocaldir='@prefix@/share/aclocal'
     extra_includes=""
     if test -f $aclocaldir/dirlist; then
-       extra_includes=`(tmp_inc=""
-       while read LINE ; do
-	  tmp_inc="$tmp_inc -I $LINE"
-       done
-       echo $tmp_inc) < $aclocaldir/dirlist`
+       extra_includes=`
+       <$aclocaldir/dirlist \
+       sed -ne 's/#.*//;s/[	 ][	 ]*$//g;s/..*/ -I &/p' |
+	 tr -d '\n'`
     else :; fi
 
     libtool_found=no