[Libreoffice-commits] core.git: configure.ac

[rbuj]

 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 359ba1dfdf8de1f2cff185f16ec21b6dc88feac9
Author: rbuj <robert.buj at gmail.com>
Date:   Sat Jun 14 21:56:58 2014 +0200

    OS X: JDK include path for JDK 1.8
    
    Change-Id: Ibc2787475249b228b987fb56fab04b8465a26136

diff --git a/configure.ac b/configure.ac
index 5c78dff..6086b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7242,6 +7242,9 @@ 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"
+        fi
         ;;
 
     dragonfly*)