[SCM] GNU Automake branch, master, updated. Release-1-10-76-g9c7aee9

[Akim Demaille]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=9c7aee991634ac47e207fe54730afaa1b67dd2dc

The branch, master has been updated
       via  9c7aee991634ac47e207fe54730afaa1b67dd2dc (commit)
      from  94e81d5582c92a4376744bc5e601f60773f63e71 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9c7aee991634ac47e207fe54730afaa1b67dd2dc
Author: Akim Demaille <address@hidden>
Date:   Sat Nov 24 15:02:41 2007 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    5 +++++
 tests/defs.in |    9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9c28e4..12fc568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-11-24  Akim Demaille  <address@hidden>
 
+       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  <address@hidden>
+
        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
--- 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


hooks/post-receive
--
GNU Automake