From 77a0a40f841f932fb51ea75b3bb27c2782268aa2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 5 May 2001 22:43:31 +0000 Subject: [PATCH] 2001-05-05 Raja R Harinath For PR automake/164: * tests/Makefile.am (TESTS): Added new file. (XFAIL_TESTS): Likewise. * tests/cond10.test: New file. --- ChangeLog | 7 +++++++ tests/Makefile.am | 3 ++- tests/Makefile.in | 5 ++++- tests/cond10.test | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100755 tests/cond10.test diff --git a/ChangeLog b/ChangeLog index 799bce6b6..d48a692b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-05-05 Raja R Harinath + + For PR automake/164: + * tests/Makefile.am (TESTS): Added new file. + (XFAIL_TESTS): Likewise. + * tests/cond10.test: New file. + 2001-05-05 Tom Tromey * texinfos.am (uninstall-info-am): Debian install-info v1.8.3 diff --git a/tests/Makefile.am b/tests/Makefile.am index 04769a048..3db461e46 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test +XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test cond10.test TESTS = \ acinclude.test \ @@ -58,6 +58,7 @@ cond6.test \ cond7.test \ cond8.test \ cond9.test \ +cond10.test \ condincl.test \ condincl2.test \ condlib.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 40f908569..47206b679 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -75,7 +75,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test +XFAIL_TESTS = man.test objc.test subobj2.test yaccvpath.test cond10.test TESTS = \ acinclude.test \ @@ -131,6 +131,7 @@ cond6.test \ cond7.test \ cond8.test \ cond9.test \ +cond10.test \ condincl.test \ condincl2.test \ condlib.test \ @@ -519,6 +520,8 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic +uninstall-am: + .PHONY: all all-am check check-TESTS check-am clean clean-generic \ distclean distclean-generic distclean-local distdir dvi dvi-am \ info info-am install install-am install-data install-data-am \ diff --git a/tests/cond10.test b/tests/cond10.test new file mode 100755 index 000000000..84b4950d3 --- /dev/null +++ b/tests/cond10.test @@ -0,0 +1,33 @@ +#! /bin/sh + +# Test for bug in conditionals. From Raja R Harinath. + +. $srcdir/defs || exit 1 + +cat > configure.in << 'END' +AC_INIT(Makefile.am) +AM_INIT_AUTOMAKE(foo,0.0) +AC_PROG_CC +AM_CONDITIONAL(USE_A,[test x = y]) +AM_CONDITIONAL(USE_B,[test x = z]) +AC_OUTPUT(Makefile) +END + +cat > Makefile.am << 'END' +if USE_A +out=output_a.c +else +if USE_B +out=output_b.c +else +out=output_c.c +endif +endif + +noinst_PROGRAMS=foo +foo_SOURCES=foo.c $(out) +END + +$ACLOCAL \ + && $AUTOMAKE -a \ + && grep 'USE_A_FALSE.*USE_B_FALSE.*output_c\...OBJEXT.' Makefile.in -- 2.34.1