diff -u -r automake_patch3/ChangeLog automake_patch4/ChangeLog
--- automake_patch3/ChangeLog	Thu Aug  2 02:53:04 2001
+++ automake_patch4/ChangeLog	Thu Aug  2 02:53:14 2001
@@ -1,5 +1,13 @@
 2001-08-02  Richard Boulton <address@hidden>
 
+	* 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 <address@hidden>
+
 	* automake.in (value_to_list): Check for whether $from is defined,
 	rather than whether it is true, so that empty $froms are allowed in
 	substitution reference patterns.
diff -u -r automake_patch3/tests/Makefile.am automake_patch4/tests/Makefile.am
--- automake_patch3/tests/Makefile.am	Thu Aug  2 02:31:44 2001
+++ automake_patch4/tests/Makefile.am	Thu Aug  2 02:41:29 2001
@@ -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 \
@@ -70,6 +70,7 @@
 cond14.test \
 cond15.test \
 cond16.test \
+cond17.test \
 condincl.test \
 condincl2.test \
 condlib.test \
diff -u -r automake_patch3/tests/Makefile.in automake_patch4/tests/Makefile.in
--- automake_patch3/tests/Makefile.in	Thu Aug  2 02:31:48 2001
+++ automake_patch4/tests/Makefile.in	Thu Aug  2 02:44:42 2001
@@ -68,7 +68,7 @@
 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 \
@@ -138,6 +138,7 @@
 cond14.test \
 cond15.test \
 cond16.test \
+cond17.test \
 condincl.test \
 condincl2.test \
 condlib.test \
diff -u -r automake_patch3/tests/cond17.test automake_patch4/tests/cond17.test
--- automake_patch3/tests/cond17.test	Thu Jan  1 01:00:00 1970
+++ automake_patch4/tests/cond17.test	Thu Aug  2 02:44:25 2001
@@ -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