diff options
| author | rbuj <robert.buj@gmail.com> | 2014-06-29 10:08:16 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-06-29 17:34:10 +0000 |
| commit | 2c2df7185cd01c6cc1ed6f7acb46f0110c6b331c (patch) | |
| tree | 86da021a0ccc18c8439c052eaaa1652a07313a32 | |
| parent | a0233e6e03ca310b1c7dcc216ae18cdef6fc0d53 (diff) | |
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/9960
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c3cc0557a9ea..f05ed540b865 100644 --- a/configure.ac +++ b/configure.ac @@ -6850,6 +6850,12 @@ if test "$ENABLE_JAVA" != ""; then 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 if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVAINTERPRETER, $with_java) |