From 7bffb67bdfbaaf24317fd308399572f60cd15b9c Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 20 Apr 2011 18:32:02 +0200
Subject: osx fix: query availability of JVM header, ie    -
 /System/Library/Frameworks/JavaVM.framework/Headers/ Java 10.6 Update 4    -
 /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/
 Prev. Version

---
 make/gluegen-cpptasks-base.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'make/gluegen-cpptasks-base.xml')

diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index ced58c0..ac09037 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -923,7 +923,12 @@
       <echo message="MacOSX" />
       <property name="compiler.cfg.id.base"          value="compiler.cfg.macosx" /> 
       <property name="linker.cfg.id.base"            value="linker.cfg.macosx" /> 
-      <property name="java.includes.dir.platform"    value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" />
+      <!-- Need to select either Java 10.6 Update 4's location or the old one -->
+      <condition property="java.includes.dir.platform"
+                 value="/System/Library/Frameworks/JavaVM.framework/Headers" 
+                 else="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers">
+                 <available file="/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"/>
+      </condition>
       <property name="java.lib.dir.platform"         value="/System/Library/Frameworks/JavaVM.framework/Libraries" />
     </target>
 
-- 
cgit v1.2.3