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 a9c28e4..12fc568 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
        * automake.in (&transform_token): New.
        (&transform): Use it.

diff --git a/tests/defs.in b/tests/defs.in
index d79d874..107bfe8 100644 (file)
--- 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