[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-464-g7f21561

[Stefano Lattarini]

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=7f21561c734bed8ba20224017de163f3646dc26e

The branch, branch-1.11 has been updated
       via  7f21561c734bed8ba20224017de163f3646dc26e (commit)
       via  142dab55025486e30985177a814e8c50f6a78c05 (commit)
       via  d9e4f1ec7d87ed96bb663c883ee3dd96e56affa9 (commit)
      from  a94c8cfa2ef731ded0aef7531d0a41162c83ff65 (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 7f21561c734bed8ba20224017de163f3646dc26e
Merge: a94c8cf 142dab5
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 8 10:32:55 2011 +0200

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: fix spurious failure with Solaris make

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

Summary of changes:
 ChangeLog                               |    8 ++++++++
 tests/distcheck-configure-flags-am.test |    6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81f1f0c..34badd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with Solaris make
+       * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
+       liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
+       so introduced, in conjunction with single quotes, might confuse
+       Solaris make.
+
 2011-08-03  Stefano Lattarini  <address@hidden>
 
        maintcheck: fix maintainer-check failures, both real and spurious
diff --git a/tests/distcheck-configure-flags-am.test 
b/tests/distcheck-configure-flags-am.test
index a5cab6a..dc31ee3 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/tests/distcheck-configure-flags-am.test
@@ -32,7 +32,9 @@ END
 unset sentence || :
 
 cat > Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-success sentence='it works :-)'
+AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
+dc_flags1 = --enable-success sentence='it works :-)'
+dc_flags2 =
 END
 
 $ACLOCAL
@@ -54,7 +56,7 @@ $MAKE distcheck
 # $(AM_DISTCHECK_CONFIGURE_FLAGS)
 
 cat >> Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS += --disable-success
+dc_flags2 += --disable-success
 END
 $AUTOMAKE Makefile
 ./config.status Makefile


hooks/post-receive
-- 
GNU Automake