From a8e3d791c2d5a0f8744b4da0e67601aa0cb4aac8 Mon Sep 17 00:00:00 2001
From: Ricardo Fabbri <rfabbri@gmail.com>
Date: Tue, 3 Sep 2013 20:45:33 -0300
Subject: [PATCH] respecting users JAVA_HOME; be quiet when running java_home
 in OSX

Change-Id: I497a074ae41007f4c015662f113754024ea1f00a
---
 scilab/bin/scilab | 6 ++++--
 scilab/m4/java.m4 | 9 +--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index d1f44a1..6ac3771 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -295,7 +295,9 @@ set_macosx_java_vm () {
     # For Mac OS X, Since path are different from the JVM normal tree,
     # don't need to detect the CPU
     JAVA_SHLIB="libjava.jnilib"
-    JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
+    if test -z "$JAVA_HOME"; then
+      JAVA_HOME=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)
+    fi
     DYLD_LIBRARY_PATH="$JAVA_HOME/../Libraries${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"
 
 }
@@ -716,7 +718,7 @@ check_macosx_version()
             case $macosxMinorVersion in
                 7|8)
                    # We force to install JRE on Lion
-                   /usr/libexec/java_home --request
+                   /usr/libexec/java_home --request > /dev/null
                    ;;
                 6)
 
diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
index e1af17c..ffdd880 100644
--- a/scilab/m4/java.m4
+++ b/scilab/m4/java.m4
@@ -749,14 +749,7 @@ AC_DEFUN([AC_JAVA_WITH_JDK], [
 
 AC_DEFUN([AC_JAVA_TOOLS], [
 
-
-    case "$host_os" in
-          *darwin*)
-          ac_java_jvm_bin_dir=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/bin/
-    ;;
-          *)
-              ac_java_jvm_bin_dir=$ac_java_jvm_dir/bin;;
-    esac
+    ac_java_jvm_bin_dir=$ac_java_jvm_dir/bin
 
     AC_JAVA_TOOLS_CHECK(JAVA, java, $ac_java_jvm_bin_dir)
 
-- 
1.7.12.4 (Apple Git-37)