New location for jni.h under MacOSX 10.8 76/8676/3
Bruno JOFRET [Mon, 13 Aug 2012 07:11:45 +0000 (09:11 +0200)]
Change-Id: I32c7606db23bbde8aa1b1454d751c67b330ce886

scilab/configure
scilab/m4/java.m4

index 972a833..492e432 100755 (executable)
@@ -11062,7 +11062,7 @@ $as_echo "$ac_java_jvm_version" >&6; }
          else
         case "$host_os" in
              *darwin* )
-                       ac_java_jvm_jni_include_flags="-I/Developer/SDKs/MacOSX${macosx_version}.sdk/System/Library/Frameworks/JavaVM.framework/Headers -I$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/include/"
+                       ac_java_jvm_jni_include_flags="-I/Developer/SDKs/MacOSX${macosx_version}.sdk/System/Library/Frameworks/JavaVM.framework/Headers -I$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/include/ -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
                   ;;
               *)
                        as_fn_error $? "Could not locate Java's jni.h include file" "$LINENO" 5
index 89abc89..e1af17c 100644 (file)
@@ -151,7 +151,7 @@ public class conftest {
     public static void main(String[[]] argv) {
         [$2]
     }
-    
+
     private static int compare(String v1, String v2) {
         String s1 = normalisedVersion(v1);
         String s2 = normalisedVersion(v2);
@@ -393,7 +393,7 @@ AC_DEFUN([AC_JAVA_JNI_INCLUDE], [
          else
         case "$host_os" in
              *darwin* )
-                       ac_java_jvm_jni_include_flags="-I/Developer/SDKs/MacOSX${macosx_version}.sdk/System/Library/Frameworks/JavaVM.framework/Headers -I$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/include/"
+                       ac_java_jvm_jni_include_flags="-I/Developer/SDKs/MacOSX${macosx_version}.sdk/System/Library/Frameworks/JavaVM.framework/Headers -I$(/usr/libexec/java_home --arch x86_64 --failfast --version 1.6+)/include/ -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/"
                   ;;
               *)
                        AC_MSG_ERROR([Could not locate Java's jni.h include file])