[Automake-commit] [SCM] GNU Automake branch, next, updated. v1.10b-5-g371b586

[Ralf Wildenhues]

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=371b586076414c1cafce4c66ca80fa7fac313aa0

The branch, next has been updated
       via  371b586076414c1cafce4c66ca80fa7fac313aa0 (commit)
      from  f5ddd3b0a9522ef9933fc04743e476c0c303e181 (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 371b586076414c1cafce4c66ca80fa7fac313aa0
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Apr 1 20:36:22 2009 +0200

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

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

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

diff --git a/ChangeLog b/ChangeLog
index e60c688..72809f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-01  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        Fix typo in manual.
diff --git a/tests/defs.in b/tests/defs.in
index aee5dfa..3193eed 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


hooks/post-receive
--
GNU Automake