From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 8 Aug 2011 08:20:47 +0000 (+0200)
Subject: tests: fix spurious failure with Solaris make
X-Git-Tag: v1.11.1b~24^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e4f1ec7d87ed96bb663c883ee3dd96e56affa9;p=thirdparty%2Fautomake.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 9fabd7d12..5ee2a1684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	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-06-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
diff --git a/tests/distcheck-configure-flags-am.test b/tests/distcheck-configure-flags-am.test
index a5cab6a50..dc31ee35c 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