Changeset 2206 for trunk

Timestamp:

Apr 13, 2011, 1:53:34 PM (14 years ago)

Author:

gah

Message:

 

File:

• trunk/cf/rp_lang_java.m4 (modified) (1 diff)

trunk/cf/rp_lang_java.m4

@@ -37 +37 @@
     if test -r "${d}/include/jni.h" ; then
       JDK=${d}
+      JAVA_HOME=$JDK
+      JAVA_INC_DIR=${JDK}/include
+      JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
+      break;
+    fi
+    if test -r "${d}/Headers/jni.h" ; then
+      JDK=${d}
+      JAVA_HOME=$JDK
+      JAVA_INC_DIR=${JDK}/Headers
+      JAVA_INC_SPEC="-I${JDK}/Headers -I${JDK}/Headers/macos"
       break;
     fi
   done
-  JAVA_HOME=$JDK
-  JAVA_INC_DIR=${JDK}/include
-  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
 fi
 ])