New configure options --disable-java, --disable-native-java.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 5ff94dfffca6484ef0c208aafbed2f115f682065..3f6e21b6e27dbcdff4661ad229ed3136f2147a75 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-13  Bruno Haible  <bruno@clisp.org>
+
+       New configure options --disable-java, --disable-native-java.
+       * configure.ac: Invoke gt_JAVA_CHOICE.
+       (BUILDJAVA): Use it.
+
 2005-08-10  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (SUBDIR_libasprintf, SUBDIR_glocale): Remove AC_SUBSTs.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index ee80c77e6ee9a7dd81122c9d286bd0d5f201a22c..7ab4f823192b55837d5db5367299c6660e3ea370 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -35,9 +35,11 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_YACC
 
+gt_JAVA_CHOICE
+
 gt_JAVACOMP
 AC_CHECK_PROG(JAR, jar, jar)
-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes
 else
   BUILDJAVA=no

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 1425244f241b84c93f82decaf2ca05181799ac57..4f969b991651921841b73b66c4aeb3bb0447855d 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-13  Bruno Haible  <bruno@clisp.org>
+
+       New configure options --disable-java, --disable-native-java.
+       * configure.ac: Invoke gt_JAVA_CHOICE.
+       (BUILDJAVAEXE, BUILDJAVA): Use it.
+
 2005-08-11  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Accept --without-emacs option.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index d68f7387c46ce646cf63109b0b3bb0ee8f362978..d60e27cefc9d7aa93a53e85b4b4f05ed58f4cfd3 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -36,8 +36,10 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_YACC
 
+gt_JAVA_CHOICE
+
 gt_GCJ
-if test -n "$HAVE_GCJ"; then
+if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then
   BUILDJAVAEXE=yes
 else
   BUILDJAVAEXE=no
@@ -46,7 +48,7 @@ AC_SUBST(BUILDJAVAEXE)
 
 gt_JAVACOMP
 AC_CHECK_PROG(JAR, jar, jar)
-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes
 else
   BUILDJAVA=no

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 8fa0e5f388b0179b4f14af02953df424a652ae3f..3818d74c607fcd3b6f56237801425f1e83fff88b 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-13  Bruno Haible  <bruno@clisp.org>
+
+       * java.m4: New file.
+       * Makefile.am (EXTRA_DIST): Add it.
+
 2005-08-16  Bruno Haible  <bruno@clisp.org>
 
        * strcase.m4: Remove file.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 30e3115f1ff7d7e0e6babc1c2bb2866261484f4a..2e1baea0a45edcfdd3641132e85401eeb33fbe5b 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -66,6 +66,7 @@ getndelim2.m4 \
 getopt.m4 \
 hard-locale.m4 \
 hostname.m4 \
+java.m4 \
 javacomp.m4 \
 javaexec.m4 \
 locale-fr.m4 \

diff --git a/gettext-tools/m4/java.m4 b/gettext-tools/m4/java.m4
new file mode 100644 (file)
index 0000000..d04a660
--- /dev/null
+++ b/gettext-tools/m4/java.m4
@@ -0,0 +1,23 @@
+# java.m4 serial 1 (gettext-0.15)
+dnl Copyright (C) 2005 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.
+
+# Sets JAVA_CHOICE to 'yes', 'bytecode' or 'no', depending on the preferred
+# use of Java.
+AC_DEFUN([gt_JAVA_CHOICE],
+[
+  AC_MSG_CHECKING([whether to use Java])
+  AC_ARG_ENABLE(java,
+    [  --disable-java          do not build Java sources],
+    [JAVA_CHOICE="$enableval"],
+    [JAVA_CHOICE=yes])
+  AC_MSG_RESULT([$JAVA_CHOICE])
+  if test "$JAVA_CHOICE" = yes; then
+    AC_ARG_ENABLE(native-java,
+      [  --disable-native-java   do not compile Java to native executables],
+      [test "$enableval" != no || JAVA_CHOICE=bytecode])
+  fi
+  AC_SUBST(JAVA_CHOICE)
+])