* tests/cond29.test: Also check for _SOURCES.

Report from Paolo Bonzini.

diff --git a/ChangeLog b/ChangeLog
index 25323dfa99481f9daf9a5af5f0d71382005258ec..b25b8e0707911a7feed3ec615932ce60094e2c0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-20  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/cond29.test: Also check for _SOURCES.
+       Report from Paolo Bonzini.
+
 2003-06-20  Akim Demaille  <akim@epita.fr>
 
        * lib/am/configure.am: Replace leading spaces with a real tab.

diff --git a/NEWS b/NEWS
index eeec793b67e261d49f82c3e1cf1c3044e6d86443..efe5a188227e8bbfc9d3ebd1801a35c586fbdd94 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ New in 1.7a:
     endif
     ...
 
-  Likewise for _LDADD and _LIBADD variables.
+  Likewise for _SOURCES, _LDADD, and _LIBADD variables.
 
 * Automake now supports bin_PROGRAMS (or any *_PROGRAMS variable)
   being defined in several conditions.  As in
@@ -32,7 +32,7 @@ New in 1.7a:
       bin_PROGRAMS = a2
     endif
 
-  Likewise for _LDADD and _LIBADD variables.
+  Likewise for _SOURCES, _LDADD, and _LIBADD variables.
 
 * install-sh now understands --version and --help.
 

diff --git a/tests/cond29.test b/tests/cond29.test
index f456ff3dac3b7c3a93801342f29b28304fc9f73d..2b5e69ce7cd0f265d8daddfef14a0368a0aec6f4 100755 (executable)
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -21,11 +21,12 @@
 # Check that many conditions do not lead to combinatorial explosion.
 # (This is related to PR/352.)
 #
-# On this test, Automake 1.7.x would compute all 2**22 = 4194304 possible
-# combinations of conditionals (it would do this three times, to define
-# a01_DEPENDENCIES, a02_DEPENDENCIES, and to rewrite bin_PROGRAM), eating
-# all memory, swap, or cpu time it can found.  Although this test won't 
-# print `FAIL' if it fails, it will take long enough so it can't go unnoticed.
+# On this test, Automake 1.7.x would compute all 2**22 = 4194304
+# possible combinations of conditionals (it would do this five times,
+# to define a01_DEPENDENCIES, a02_DEPENDENCIES, a03_OBJECTS,
+# a04_OBJECTS, and to rewrite bin_PROGRAM), eating all memory, swap,
+# or cpu time it can found.  Although this test won't print `FAIL' if
+# it fails, it will take long enough so it can't go unnoticed.
 
 . ./defs
 
@@ -36,6 +37,7 @@ echo AC_PROG_CC >>configure.in
 cat >Makefile.am <<EOF
 bin_PROGRAMS = a
 a02_LDADD =
+a03_SOURCES =
 EOF
 
 for i in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22; do
@@ -44,6 +46,8 @@ if C$i
 bin_PROGRAMS += a$i
 a01_LDADD = foo${i}.o
 a02_LDADD += bar${i}.o
+a03_SOURCES += baz${i}.c
+a04_SOURCES = quux${i}.c
 endif C$i
 EOF
 echo "AM_CONDITIONAL([C$i], [:])" >>configure.in