Kaydet (Commit) 2c2df718 authored tarafından rbuj's avatar rbuj Kaydeden (comit) Norbert Thiebaud

OS X: JDK_HOME configuration

/usr/libexec/java_home helps to set the current JDK_HOME.
Actually JDK_HOME should NOT be set where java (/usr/bin/java) is located.
AC_PATH_PROG(JAVAINTERPRETER, $with_java) returns /usr/bin/java.
/usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java.

Change-Id: Ie3166731c1525f5b44414fa4dda642edb9408757
Reviewed-on: https://gerrit.libreoffice.org/9960Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst a0233e6e
...@@ -6850,6 +6850,12 @@ if test "$ENABLE_JAVA" != ""; then ...@@ -6850,6 +6850,12 @@ if test "$ENABLE_JAVA" != ""; then
fi fi
fi fi
# MacOS X: /usr/libexec/java_home helps to set the current JDK_HOME. Actually JDK_HOME should NOT be set where java (/usr/bin/java) is located.
# /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java, but /usr does not contain the JDK libraries
if test -z "$with_jdk_home" -a "$_os" = "Darwin" -a -x /usr/libexec/java_home; then
with_jdk_home=`/usr/libexec/java_home`
fi
JAVA_HOME=; export JAVA_HOME JAVA_HOME=; export JAVA_HOME
if test -z "$with_jdk_home"; then if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVAINTERPRETER, $with_java) AC_PATH_PROG(JAVAINTERPRETER, $with_java)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment