* tests/cond17.test: New file: test for being able to define an

object to be generated in different ways according to a
conditional.
* tests/Makefile.am (XFAIL_TESTS): Add cond17.test.
(TESTS): Added cond17.test.

diff --git a/ChangeLog b/ChangeLog
index 20a78aa8cf68e3bf687859ecc23221c9d7bf9d62..d9a9c9559805e9eba19263e830c94e414eee6800 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-04  Richard Boulton <richard@tartarus.org>
+
+       * tests/cond17.test: New file: test for being able to define an
+       object to be generated in different ways according to a
+       conditional.
+       * tests/Makefile.am (XFAIL_TESTS): Add cond17.test.
+       (TESTS): Added cond17.test.
+
 2001-08-02  Richard Boulton <richard@tartarus.org>
 
        * automake.in (variable_conditions_sub): Handle variable

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3fcf63a9caee36245da1b986620ef9f7c088ce38..e4468a5d5baaf657ef8a0179c49f276ffde9eb5e 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 cond17.test
 
 TESTS =        \
 acinclude.test \
@@ -68,6 +68,7 @@ cond11.test \
 cond12.test \
 cond13.test \
 cond16.test \
+cond17.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3cc48ad65cf0a0debec0083a860a69b5c53e7627..78d13b635a6a46aaeffbfd53c0fe5cea1c2f39e7 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 cond17.test
 
 TESTS = \
 acinclude.test \
@@ -136,6 +136,7 @@ cond11.test \
 cond12.test \
 cond13.test \
 cond16.test \
+cond17.test \
 condincl.test \
 condincl2.test \
 condlib.test \

diff --git a/tests/cond17.test b/tests/cond17.test
new file mode 100755 (executable)
index 0000000..8ab4bb3
--- /dev/null
+++ b/tests/cond17.test
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+# Test for being able to define an object to be generated in different ways
+# according to a conditional.
+# Report from Richard Boulton
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(Makefile.am)
+AM_INIT_AUTOMAKE(hello,0.23)
+AC_PROG_CC
+AC_PROG_CXX
+AM_CONDITIONAL(COND1, true)
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = helldl
+if COND1
+helldl_SOURCES = foo.cc
+else
+helldl_SOURCES = foo.c
+endif
+END
+
+set -e
+
+$ACLOCAL
+$AUTOMAKE -a