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

Stephan Bergmann sbergman at redhat.com
Wed Mar 20 05:52:51 PDT 2013


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c499fb240c422eb5e6d15e7f8db2408a55140c7f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 20 13:52:15 2013 +0100

    Work around -Werror,-Wundef
    
    ...from /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
    
    Change-Id: I2ae814f0491fe8a24a91504f7f14cc7416437d0f

diff --git a/configure.ac b/configure.ac
index a5e23ef..ae1dfe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6411,7 +6411,7 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z "$JAVAINC" \); then
 
     darwin*)
         x_JAVALIB=[\#]
-        JAVAINC="-I$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers -I$FRAMEWORKSHOME/JavaVM/Headers"
+        JAVAINC="${ISYSTEM}$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers ${ISYSTEM}$FRAMEWORKSHOME/JavaVM/Headers"
         ;;
 
     dragonfly*)


More information about the Libreoffice-commits mailing list