configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 2c2df7185cd01c6cc1ed6f7acb46f0110c6b331c
Author: rbuj <[email protected]>
Date: Sun Jun 29 10:08:16 2014 +0200
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 <[email protected]>
Reviewed-by: Norbert Thiebaud <[email protected]>
diff --git a/configure.ac b/configure.ac
index c3cc055..f05ed54 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)
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
