Change the gt_JAVACOMP macro to choose a Java compiler suitable for

specific source and target versions.

4 files changed, 22 insertions, 18 deletions

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 05fc3b14c..a2f5a9705 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-01  Bruno Haible  <bruno@clisp.org>
+
+	* hello-java/configure.ac: Pass a source-version to gt_JAVACOMP. Move
+	gt_JAVAEXEC call before the gt_JAVACOMP call.
+	* hello-java-awt/configure.ac: Likewise.
+	* hello-java-swing/configure.ac: Likewise.
+
 2006-04-17  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
diff --git a/gettext-tools/examples/hello-java-awt/configure.ac b/gettext-tools/examples/hello-java-awt/configure.ac
index e606b58b6..618f5b184 100644
--- a/gettext-tools/examples/hello-java-awt/configure.ac
+++ b/gettext-tools/examples/hello-java-awt/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -22,8 +22,10 @@ AC_SUBST(BUILDJAVAEXE)
 AM_CONDITIONAL([USEJEXE], [test $BUILDJAVAEXE = yes])
 AC_PROG_RANLIB
 
-dnl Check whether we can build Java programs at all.
-gt_JAVACOMP
+dnl Check whether we can execute Java programs.
+gt_JAVAEXEC([TestAWT], [$srcdir/m4])
+dnl Check whether we can build Java programs.
+gt_JAVACOMP([1.3])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes
@@ -31,9 +33,6 @@ else
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-
-dnl Check whether we can execute Java programs.
-gt_JAVAEXEC([TestAWT], [$srcdir/m4])
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
diff --git a/gettext-tools/examples/hello-java-swing/configure.ac b/gettext-tools/examples/hello-java-swing/configure.ac
index 45bbe31ea..34e5dd2eb 100644
--- a/gettext-tools/examples/hello-java-swing/configure.ac
+++ b/gettext-tools/examples/hello-java-swing/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -22,8 +22,10 @@ AC_SUBST(BUILDJAVAEXE)
 AM_CONDITIONAL([USEJEXE], [test $BUILDJAVAEXE = yes])
 AC_PROG_RANLIB
 
-dnl Check whether we can build Java programs at all.
-gt_JAVACOMP
+dnl Check whether we can execute Java programs.
+gt_JAVAEXEC([TestAWT], [$srcdir/m4])
+dnl Check whether we can build Java programs.
+gt_JAVACOMP([1.3])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes
@@ -31,9 +33,6 @@ else
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-
-dnl Check whether we can execute Java programs.
-gt_JAVAEXEC([TestAWT], [$srcdir/m4])
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
diff --git a/gettext-tools/examples/hello-java/configure.ac b/gettext-tools/examples/hello-java/configure.ac
index b0932521d..689449703 100644
--- a/gettext-tools/examples/hello-java/configure.ac
+++ b/gettext-tools/examples/hello-java/configure.ac
@@ -1,5 +1,5 @@
 dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 dnl This file is in the public domain.
 dnl
 dnl Configuration file - processed by autoconf.
@@ -22,8 +22,10 @@ AC_SUBST(BUILDJAVAEXE)
 AM_CONDITIONAL([USEJEXE], [test "$BUILDJAVAEXE" = yes])
 AC_PROG_RANLIB
 
-dnl Check whether we can build Java programs at all.
-gt_JAVACOMP
+dnl Check whether we can execute Java programs.
+gt_JAVAEXEC
+dnl Check whether we can build Java programs.
+gt_JAVACOMP([1.3])
 AC_CHECK_PROG(JAR, jar, jar)
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
   BUILDJAVA=yes
@@ -31,9 +33,6 @@ else
   BUILDJAVA=no
 fi
 AC_SUBST(BUILDJAVA)
-
-dnl Check whether we can execute Java programs.
-gt_JAVAEXEC
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else