Treat gcj-4.x like gcj-3.x.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 5aedf632fb1ec11be390b355f25f91cb9432ffed..4809fd3788ef695ea218497c4b3383a0f90f05c3 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11  Bruno Haible  <bruno@clisp.org>
+
+       * javacomp.m4 (gt_JAVACOMP): Treat gcj-4.x like gcj-3.x.
+
 2005-12-04  Bruno Haible  <bruno@clisp.org>
 
        * csharpexec.m4 (gt_CSHARPEXEC): Add support for 'clix' launcher

diff --git a/gettext-tools/m4/javacomp.m4 b/gettext-tools/m4/javacomp.m4
index a180647a52ac0d3e8b584d579ba1a58cda1a0e3b..1d49574f284c119d7ef3167c8c7d090dc4e426e0 100644 (file)
--- a/gettext-tools/m4/javacomp.m4
+++ b/gettext-tools/m4/javacomp.m4
@@ -1,5 +1,5 @@
-# javacomp.m4 serial 6 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# javacomp.m4 serial 7 (gettext-0.15)
+dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -32,14 +32,14 @@ changequote(,)dnl
     # Test for a good gcj version (>= 3.0).
     # Exclude some versions of gcj: gcj 3.0.4 compiles GetURL.java to invalid
     # bytecode, that crashes with an IllegalAccessError when executed by
-    # gij 3.0.4 or with a VerifyError when executed by Sun Java. Likewise for
-    # gcj 3.1.
-    # I also exclude gcj 3.2, 3.3 etc. because I have no idea when this bug
+    # gij 3.0.4 or with a VerifyError when executed by Sun Java 1.3.1. Likewise
+    # for gcj 3.1 ... 4.1.
+    # I also exclude gcj 4.2, 4.3 etc. because I have no idea when this bug
     # will be fixed. The bug is registered as java/7066, see
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7066
     # FIXME: Check new versions of gcj as they come out.
     if test -n "$HAVE_GCJ_IN_PATH" \
-       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^3\.[0123456789]/d' | grep '^[3-9]' >/dev/null \
+       && gcj --version 2>/dev/null | sed -e 's,^[^0-9]*,,' -e 1q | sed -e '/^[34]\.[0123456789]/d' | grep '^[3-9]' >/dev/null \
        && (
         # See if libgcj.jar is well installed.
         cat > conftest.java <<EOF