* tests/Makefile.am (TESTS): Added cond13.test.

	(XFAIL_TESTS): Likewise.
	* tests/cond13.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 2d8a5669d94fb48a5cb8f92003c596c84427d978..e15ebaf8cf72e5d0cf8d362213ef2b2db7f960f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-07-31  Tom Tromey  <tromey@redhat.com>
 
+       * tests/Makefile.am (TESTS): Added cond13.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/cond13.test: New file.
+
        * configure.in: Upped to version 1.4k.
 
        * configure.in: Released 1.4j.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa8e64f309f986fb1a150e66c6834fc162f2eab4..cae8b9d988f0f476be4d64b987dcd1811f105fba 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test auxdir2.test
+XFAIL_TESTS = subdir5.test auxdir2.test cond13.test
 
 TESTS =        \
 acinclude.test \
@@ -66,6 +66,7 @@ cond9.test \
 cond10.test \
 cond11.test \
 cond12.test \
+cond13.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8d2d05e4a7d78b89239708ee5bbc7c842ae0d2aa..5e13adee0b4ae1007fee948732dabef1056e5cdd 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -68,7 +68,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test auxdir2.test
+XFAIL_TESTS = subdir5.test auxdir2.test cond13.test
 
 TESTS = \
 acinclude.test \
@@ -134,6 +134,7 @@ cond9.test \
 cond10.test \
 cond11.test \
 cond12.test \
+cond13.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/cond13.test b/tests/cond13.test
new file mode 100755 (executable)
index 0000000..81a9fe6
--- /dev/null
+++ b/tests/cond13.test
@@ -0,0 +1,39 @@
+#! /bin/sh
+
+# Test for bug in conditionals.
+# Report from Lars J. Aas.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_RANLIB
+AM_CONDITIONAL(COND1, true)
+AM_CONDITIONAL(COND2, true)
+END
+
+cat > Makefile.am << 'END'
+noinst_LIBRARIES = libtest.a
+
+if COND1
+SOURCEVAR1 = 
+SOURCEVAR2 = habla.cpp espanol.cpp
+else
+SOURCEVAR1 = dummy.cpp
+SOURCEVAR2 =
+endif
+
+if COND2
+TESTSOURCES = $(SOURCEVAR1)
+else
+TESTSOURCES = $(SOURCEVAR2)
+endif
+
+libtest_a_SOURCES = $(TESTSOURCES)
+END
+
+$ACLOCAL || exit 1
+$AUTOMAKE || exit 1
+
+grep 'am_libtest_a_OBJECTS = .*$' Makefile.in