From 9bfd2963cea796f7a61407ce2b64d00adb53046d Mon Sep 17 00:00:00 2001 From: Ricardo Fabbri Date: Wed, 13 Nov 2013 21:20:26 -0200 Subject: [PATCH] Respecting JAVA_HOME environment variable Change-Id: I6ff3a6cfa5f58019e244e4b0edec8801c4cc1f91 --- scilab/m4/java.m4 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4 index ffdd880..4229c8f 100644 --- a/scilab/m4/java.m4 +++ b/scilab/m4/java.m4 @@ -70,8 +70,12 @@ AC_DEFUN([AC_PROG_JAVAC], [ # Don't follow the symlink since Java under MacOS is messy # Uses the wrapper providing by Apple to retrieve the path # See: http://developer.apple.com/mac/library/qa/qa2001/qa1170.html + if test -z "$JAVA_HOME"; then JAVAC=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/bin/javac - DONT_FOLLOW_SYMLINK=yes + else + JAVAC=$JAVA_HOME/bin/javac + fi + DONT_FOLLOW_SYMLINK=yes ;; esac fi @@ -254,7 +258,11 @@ Maybe JAVA_HOME is pointing to a JRE (Java Runtime Environment) instead of a JDK *darwin* ) AC_MSG_RESULT([Darwin (Mac OS X) found. Use the standard paths.]) # See: http://developer.apple.com/mac/library/qa/qa2001/qa1170.html - ac_java_jvm_dir=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+) + if test -z "$JAVA_HOME"; then + ac_java_jvm_dir=$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+) + else + ac_java_jvm_dir=$JAVA_HOME + fi JAVAC=$ac_java_jvm_dir/bin/javac ;; esac -- 1.8.4.2