AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.

* tests/gcj6.test: New test.
* tests/Makefile.am: Update; mark gcj6.test as XFAIL.
* THANKS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 0ef0267..547fc27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-24  Jack Kelly  <endgame.dos@gmail.com>  (tiny change)
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       AM_PROG_GCJ currently fails to define OBJEXT and EXEEXT.
+       * tests/gcj6.test: New test.
+       * tests/Makefile.am: Update; mark gcj6.test as XFAIL.
+       * THANKS: Update.
+
 2009-05-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        parallel-tests: avoid GNU make 3.80 substitution bug.

diff --git a/THANKS b/THANKS
index 6f6598e..852f244 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Ian Lance Taylor    ian@cygnus.com
 Илья Н. Голубев            gin@mo.msk.ru
 Imacat                 imacat@mail.imacat.idv.tw
 Inoue                  inoue@ainet.or.jp
+Jack Kelly             endgame.dos@gmail.com
 James Amundson         amundson@users.sourceforge.net
 James Henstridge       james@daa.com.au
 James R. Van Zandt     jrv@vanzandt.mv.com

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7895816..62529a6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ XFAIL_TESTS =                                   \
 all.test                                       \
 auxdir2.test                                   \
 cond17.test                                    \
+gcj6.test                                      \
 txinfo5.test
 
 include $(srcdir)/parallel-tests.am
@@ -303,6 +304,7 @@ gcj2.test \
 gcj3.test \
 gcj4.test \
 gcj5.test \
+gcj6.test \
 getopt.test \
 gettext.test \
 gettext2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index e08860b..1060dcf 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -229,6 +229,7 @@ XFAIL_TESTS = \
 all.test                                       \
 auxdir2.test                                   \
 cond17.test                                    \
+gcj6.test                                      \
 txinfo5.test
 
 parallel_tests = \
@@ -536,6 +537,7 @@ gcj2.test \
 gcj3.test \
 gcj4.test \
 gcj5.test \
+gcj6.test \
 getopt.test \
 gettext.test \
 gettext2.test \

diff --git a/tests/gcj6.test b/tests/gcj6.test
new file mode 100755 (executable)
index 0000000..be5f49c
--- /dev/null
+++ b/tests/gcj6.test
@@ -0,0 +1,53 @@
+#! /bin/sh
+# Copyright (C) 2009  Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
+
+required='gcj'
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AM_PROG_GCJ
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+noinst_PROGRAMS = test
+test_SOURCES = Test.java
+test_LDFLAGS = --main=Test
+END
+
+cat >Test.java << 'END'
+public class Test {
+    public static void main(String[] argv) {
+        System.out.println("Hello, automake!");
+    }
+}
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
+
+# These fail without e.g., AC_PROG_CC.
+$MAKE
+grep "OBJEXT = " Makefile
+grep "EXEEXT = " Makefile
+
+: