From 682da5279cfb410e7b021de77948db53e4831ef1 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 24 May 2002 10:36:11 +0000 Subject: [PATCH] For PR automake/323: * m4/depend.m4: Missing comma. * tests/gcj4.test: New file. * tests/Makefile.am (TESTS): Add gcj4.test. Reported by David Pashley. --- ChangeLog | 10 +++++++++- THANKS | 1 + m4/depend.m4 | 2 +- tests/Makefile.am | 1 + tests/Makefile.in | 1 + tests/gcj4.test | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100755 tests/gcj4.test diff --git a/ChangeLog b/ChangeLog index 9f0bfea0..5497c7e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ +2002-05-24 Alexandre Duret-Lutz + + For PR automake/323: + * m4/depend.m4: Missing comma. + * tests/gcj4.test: New file. + * tests/Makefile.am (TESTS): Add gcj4.test. + Reported by David Pashley. + 2002-05-22 Alexandre Duret-Lutz - * tests/defs (confiugre.in): Don't double-quote $me. + * tests/defs (configure.in): Don't double-quote $me. * tests/sinclude.test: Overwrite configure.in and use `am__sinclude' instead of `sinclude' as package name. Excercise `m4_sinclude' instead of `sinclude'. diff --git a/THANKS b/THANKS index 58013831..9dbeea54 100644 --- a/THANKS +++ b/THANKS @@ -36,6 +36,7 @@ danbp danpb@nospam.postmaster.co.uk Dave Brolley brolley@redhat.com Dave Morrison dave@bnl.gov David A. Swierczek swiercze@mr.med.ge.com +David Pashley david@davidpashley.com David Zaroski cz253@cleveland.Freenet.Edu Dean Povey dpovey@wedgetail.com Derek R. Price derek.price@openavenue.com diff --git a/m4/depend.m4 b/m4/depend.m4 index c631815e..619c51d1 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -44,7 +44,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4d744bcb..9ab3b2bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -164,6 +164,7 @@ fpinstall.test \ gcj.test \ gcj2.test \ gcj3.test \ +gcj4.test \ gnits.test \ header.test \ implicit.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index a1ace4dc..dd1b5766 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -248,6 +248,7 @@ fpinstall.test \ gcj.test \ gcj2.test \ gcj3.test \ +gcj4.test \ gnits.test \ header.test \ implicit.test \ diff --git a/tests/gcj4.test b/tests/gcj4.test new file mode 100755 index 00000000..a25337cb --- /dev/null +++ b/tests/gcj4.test @@ -0,0 +1,35 @@ +#! /bin/sh + +# Make sure dependency tracking works for Java. + +required=gcj +. $srcdir/defs || exit 1 + +cat >> configure.in << 'END' +AM_PROG_GCJ +AC_OUTPUT +END + +cat > Makefile.am << 'END' +bin_PROGRAMS = convert +convert_SOURCES = convert.java +END + +set -e + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure GCJ=gcj >stdout +cat stdout + +# Configure must be checking the dependency style of gcj ... +grep 'dependency style of gcj' stdout >filt +cat filt + +# ... only once. +test `wc -l < filt` = 1 + +# Accept any outcome but `none' +# (at the time of writing it should be gcc or gcc3). +grep -v none filt -- 2.43.5