Provide test result in variable CONF_JAVA.

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 04b834628cf13a2814fad866d57af25a0cd2e22d..59ab2fa893cc4bc5a85eb4a3ba5f64ac8b2e392a 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-12  Bruno Haible  <bruno@clisp.org>
+
+       * javaexec.sh.in: Update for changed javaexec.m4.
+
 2006-03-11  Bruno Haible  <bruno@clisp.org>
 
        Avoid gcc-4.x warnings.

diff --git a/gettext-tools/lib/javaexec.sh.in b/gettext-tools/lib/javaexec.sh.in
index e7abfbd66127506957c97f8556f9c60f70dfd156..95776816ced5dda8378e45dca6bfcd8fe4bc4736 100644 (file)
--- a/gettext-tools/lib/javaexec.sh.in
+++ b/gettext-tools/lib/javaexec.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a Java program.
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 # Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,9 +27,9 @@
 #
 # The extra CLASSPATH must have been set prior to calling this script.
 
-CONF_JAVA='@JAVA@'
+CONF_JAVA='@CONF_JAVA@'
 CONF_CLASSPATH='@CLASSPATH@'
-if test -n "$CONF_JAVA"; then
+if test -n "@HAVE_JAVA_ENVVAR@"; then
   # Combine given CLASSPATH and configured CLASSPATH.
   if test -n "$CLASSPATH"; then
     CLASSPATH="$CLASSPATH${CONF_CLASSPATH:+@CLASSPATH_SEPARATOR@$CONF_CLASSPATH}"
@@ -43,20 +43,24 @@ else
   unset JAVA_HOME
   export CLASSPATH
   if test -n "@HAVE_GIJ@"; then
-    test -z "$JAVA_VERBOSE" || echo gij "$@"
-    exec gij "$@"
+    # In this case, $CONF_JAVA is "gij".
+    test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+    exec $CONF_JAVA "$@"
   else
     if test -n "@HAVE_JAVA@"; then
-      test -z "$JAVA_VERBOSE" || echo java "$@"
-      exec java "$@"
+      # In this case, $CONF_JAVA is "java".
+      test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+      exec $CONF_JAVA "$@"
     else
       if test -n "@HAVE_JRE@"; then
-        test -z "$JAVA_VERBOSE" || echo jre "$@"
-        exec jre "$@"
+        # In this case, $CONF_JAVA is "jre".
+        test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+        exec $CONF_JAVA "$@"
       else
         if test -n "@HAVE_JVIEW@"; then
-          test -z "$JAVA_VERBOSE" || echo jview "$@"
-          exec jview "$@"
+          # In this case, $CONF_JAVA is "jview".
+          test -z "$JAVA_VERBOSE" || echo "$CONF_JAVA $@"
+          exec $CONF_JAVA "$@"
         else
           echo 'Java virtual machine not found, try installing gij or set $JAVA, then reconfigure' 1>&2
           exit 1

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 4809fd3788ef695ea218497c4b3383a0f90f05c3..c351bd7c8d4865b116356595ad777af22db0e943 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-12  Bruno Haible  <bruno@clisp.org>
+
+       * javaexec.m4 (gt_JAVAEXEC): Make the result of the test available as
+       variable CONF_JAVA, for subsequent autoconf tests. Also log error
+       output in config.log.
+
 2006-03-11  Bruno Haible  <bruno@clisp.org>
 
        * javacomp.m4 (gt_JAVACOMP): Treat gcj-4.x like gcj-3.x.

diff --git a/gettext-tools/m4/javaexec.m4 b/gettext-tools/m4/javaexec.m4
index f15c13bf57bfbe514e3ca9fb2482ad4b97e1b9b0..50dbec2410599d54d4917b84150d1d692b8951c5 100644 (file)
--- a/gettext-tools/m4/javaexec.m4
+++ b/gettext-tools/m4/javaexec.m4
@@ -1,5 +1,5 @@
-# javaexec.m4 serial 2 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# javaexec.m4 serial 3 (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.
@@ -16,9 +16,16 @@ AC_DEFUN([gt_JAVAEXEC],
   yes
 #endif
 ], CLASSPATH_SEPARATOR=';', CLASSPATH_SEPARATOR=':')
+  CONF_JAVA=
+  HAVE_JAVA_ENVVAR=
+  HAVE_GIJ=
+  HAVE_JAVA=
+  HAVE_JRE=
+  HAVE_JVIEW=
   HAVE_JAVAEXEC=1
   if test -n "$JAVA"; then
-    ac_result="$JAVA"
+    HAVE_JAVA_ENVVAR=1
+    CONF_JAVA="$JAVA"
   else
     pushdef([AC_MSG_CHECKING],[:])dnl
     pushdef([AC_CHECKING],[:])dnl
@@ -37,30 +44,41 @@ AC_DEFUN([gt_JAVAEXEC],
     export CLASSPATH
     if test -n "$HAVE_GIJ_IN_PATH" \
        && gij --version >/dev/null 2>/dev/null \
-       ifelse([$1], , , [&& gij $1 >/dev/null 2>/dev/null]); then
+       ifelse([$1], , , [&& {
+         echo "$as_me:__oline__: gij $1" >&AS_MESSAGE_LOG_FD
+         gij $1 >&AS_MESSAGE_LOG_FD 2>&1
+       }]); then
       HAVE_GIJ=1
-      ac_result="gij"
+      CONF_JAVA="gij"
     else
       if test -n "$HAVE_JAVA_IN_PATH" \
          && java -version >/dev/null 2>/dev/null \
-         ifelse([$1], , , [&& java $1 >/dev/null 2>/dev/null]); then
+         ifelse([$1], , , [&& {
+           echo "$as_me:__oline__: gij $1" >&AS_MESSAGE_LOG_FD
+           java $1 >&AS_MESSAGE_LOG_FD 2>&1
+         }]); then
         HAVE_JAVA=1
-        ac_result="java"
+        CONF_JAVA="java"
       else
         if test -n "$HAVE_JRE_IN_PATH" \
            && (jre >/dev/null 2>/dev/null || test $? = 1) \
-           ifelse([$1], , , [&& jre $1 >/dev/null 2>/dev/null]); then
+           ifelse([$1], , , [&& {
+             echo "$as_me:__oline__: gij $1" >&AS_MESSAGE_LOG_FD
+             jre $1 >&AS_MESSAGE_LOG_FD 2>&1
+           }]); then
           HAVE_JRE=1
-          ac_result="jre"
+          CONF_JAVA="jre"
         else
           if test -n "$HAVE_JVIEW_IN_PATH" \
              && (jview -? >/dev/null 2>/dev/null || test $? = 1) \
-             ifelse([$1], , , [&& jview $1 >/dev/null 2>/dev/null]); then
+             ifelse([$1], , , [&& {
+               echo "$as_me:__oline__: gij $1" >&AS_MESSAGE_LOG_FD
+               jview $1 >&AS_MESSAGE_LOG_FD 2>&1
+             }]); then
             HAVE_JVIEW=1
-            ac_result="jview"
+            CONF_JAVA="jview"
           else
             HAVE_JAVAEXEC=
-            ac_result="no"
           fi
         fi
       fi
@@ -69,10 +87,16 @@ AC_DEFUN([gt_JAVAEXEC],
       CLASSPATH="$save_CLASSPATH"
     ])
   fi
+  if test -n "$HAVE_JAVAEXEC"; then
+    ac_result="$CONF_JAVA"
+  else
+    ac_result="no"
+  fi
   AC_MSG_RESULT([$ac_result])
-  AC_SUBST(JAVA)
+  AC_SUBST(CONF_JAVA)
   AC_SUBST(CLASSPATH)
   AC_SUBST(CLASSPATH_SEPARATOR)
+  AC_SUBST(HAVE_JAVA_ENVVAR)
   AC_SUBST(HAVE_GIJ)
   AC_SUBST(HAVE_JAVA)
   AC_SUBST(HAVE_JRE)