From 88eb57b776b5709f16fe10bc76c5f20bc0a62414 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sun, 24 May 2009 16:38:33 +0200 Subject: [PATCH] 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 --- ChangeLog | 8 +++++++ THANKS | 1 + tests/Makefile.am | 2 ++ tests/Makefile.in | 2 ++ tests/gcj6.test | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+) create mode 100755 tests/gcj6.test diff --git a/ChangeLog b/ChangeLog index 0ef02673f..547fc2794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-05-24 Jack Kelly (tiny change) + Ralf Wildenhues + + 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 parallel-tests: avoid GNU make 3.80 substitution bug. diff --git a/THANKS b/THANKS index 6f6598eee..852f24435 100644 --- 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 7895816be..62529a6b5 100644 --- 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 e08860b8a..1060dcfb8 100644 --- 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 index 000000000..be5f49c35 --- /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 . + +# 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 + +: -- 2.47.2