configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ae19cfde67fce2e873a649930fd17dd3274d3e74
Author: Stephan Bergmann <[email protected]>
Date: Fri Jun 27 11:19:21 2014 +0200
Assume $FRAMEWORKSHOME/JavaVM/Headers is junk
(What I have on OS X 10.9 $FRAMEWORKSHOME/JavaVM.framework/Headers, but that
should already be covered by the preceding
$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers.)
Also, fix up 359ba1dfdf8de1f2cff185f16ec21b6dc88feac9 "OS X: JDK include
path
for JDK 1.8" to not set JAVAINC twice.
Change-Id: I83c0cdc33ada897fcf8b79fb8df737af26687aa6
Reviewed-on: https://gerrit.libreoffice.org/9931
Reviewed-by: Stephan Bergmann <[email protected]>
Tested-by: Stephan Bergmann <[email protected]>
diff --git a/configure.ac b/configure.ac
index 108cb14..2f58380 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7241,9 +7241,10 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
;;
darwin*)
-
JAVAINC="${ISYSTEM}$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers
${ISYSTEM}$FRAMEWORKSHOME/JavaVM/Headers"
if test -d "$JAVA_HOME/include/darwin"; then
JAVAINC="-I$JAVA_HOME/include -I$JAVA_HOME/include/darwin"
+ else
+
JAVAINC=${ISYSTEM}$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers
fi
;;
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
