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.
## 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 \
cond10.test \
cond11.test \
cond12.test \
+cond13.test \
condincl.test \
condincl2.test \
condlib.test \
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 \
cond10.test \
cond11.test \
cond12.test \
+cond13.test \
condincl.test \
condincl2.test \
condlib.test \
--- /dev/null
+#! /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