From 684efb3706795bdd8cb0d4c026067fb4d70e23d1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 29 Aug 2012 14:15:39 +0100
Subject: java: Further java/java-home fixes.

In particular the JVM executable is now called $JAVA_EXE.

This fixes commit 40b9c14ca9af3b31ea1cf5336142d63313bbae39.
---
 configure.ac        | 4 ++--
 java/run-bindtests  | 2 +-
 java/run-java-tests | 4 ++--
 run.in              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index bf3fd784..e75b6664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1037,7 +1037,7 @@ if test "x$with_java" != "xno"; then
 '
         case $JAVA in
           *[\\\"\#\$\&\'\`$jh_lf\ \	]*)
-            AC_MSG_FAILURE([unsafe \$JAVA_HOME directory (use --without-java to disable Java support)]);;
+            AC_MSG_FAILURE([unsafe \$JAVA directory (use --without-java to disable Java support)]);;
         esac
         if test -d "$with_java"; then
             JAVA="$with_java"
@@ -1087,7 +1087,7 @@ if test "x$with_java" != "xno"; then
             JAR="$JAVA/bin/jar"
         fi
         java_version=`$JAVA_EXE -version 2>&1 | grep "java version"`
-        AC_MSG_RESULT(found $java_version in $JAVA_HOME)
+        AC_MSG_RESULT(found $java_version in $JAVA)
 
         dnl Find jni.h.
         AC_MSG_CHECKING([for jni.h])
diff --git a/java/run-bindtests b/java/run-bindtests
index 9557c9d0..10e72c71 100755
--- a/java/run-bindtests
+++ b/java/run-bindtests
@@ -18,5 +18,5 @@
 
 set -e
 
-$JAVA -Djava.library.path=.libs Bindtests > bindtests.tmp
+$JAVA_EXE -Djava.library.path=.libs Bindtests > bindtests.tmp
 diff -u $srcdir/../bindtests bindtests.tmp
diff --git a/java/run-java-tests b/java/run-java-tests
index 6ebaadfe..46c34f21 100755
--- a/java/run-java-tests
+++ b/java/run-java-tests
@@ -20,5 +20,5 @@ set -e
 
 for f in $(ls -1 t/*.class | fgrep -v \$); do
   classname=$(basename $f .class)
-  $JAVA -Djava.library.path=.libs -ea $classname
-done
\ No newline at end of file
+  $JAVA_EXE -Djava.library.path=.libs -ea $classname
+done
diff --git a/run.in b/run.in
index d6298313..7422c1ab 100644
--- a/run.in
+++ b/run.in
@@ -83,7 +83,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$b/ruby/ext/guestfs"
 export CAML_LD_LIBRARY_PATH="$b/ocaml"
 
 # For Java.
-export JAVA=@JAVA@
+export JAVA_EXE=@JAVA_EXE@
 export CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
 
 # For GObject, Javascript and friends.
-- 
cgit