FYI: missing comma in depend.m4 (PR/323)

[Alexandre Duret-Lutz]

I'm committing this on branch-1-6 and HEAD.

2002-05-24  Alexandre Duret-Lutz  <address@hidden>

        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.

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.172
diff -u -r1.172 THANKS
--- THANKS      14 May 2002 14:12:17 -0000      1.172
+++ THANKS      24 May 2002 10:23:29 -0000
@@ -36,6 +36,7 @@
 Dave Brolley           address@hidden
 Dave Morrison          address@hidden
 David A. Swierczek     address@hidden
+David Pashley          address@hidden
 David Zaroski          address@hidden
 Dean Povey             address@hidden
 Derek R. Price         address@hidden
Index: m4/depend.m4
===================================================================
RCS file: /cvs/automake/automake/m4/depend.m4,v
retrieving revision 1.24
diff -u -r1.24 depend.m4
--- m4/depend.m4        20 Jan 2002 21:37:19 -0000      1.24
+++ m4/depend.m4        24 May 2002 10:23:29 -0000
@@ -44,7 +44,7 @@
 
 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=])
 
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.399
diff -u -r1.399 Makefile.am
--- tests/Makefile.am   17 May 2002 10:49:54 -0000      1.399
+++ tests/Makefile.am   24 May 2002 10:23:29 -0000
@@ -164,6 +164,7 @@
 gcj.test \
 gcj2.test \
 gcj3.test \
+gcj4.test \
 gnits.test \
 header.test \
 implicit.test \
Index: tests/gcj4.test
===================================================================
RCS file: tests/gcj4.test
diff -N tests/gcj4.test
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/gcj4.test     24 May 2002 10:23:30 -0000
@@ -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

-- 
Alexandre Duret-Lutz