Merge pull request open-mpi#1366 from nrgraham23/darwin_java_fix

Adds darwin headers directory with Darwin JDK
ggouaillardet · Sep 17, 2016 · 373720f · 373720f
2 parents d9426a8 + e3c8f6d
commit 373720f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/config/opal_setup_java.m4 b/config/opal_setup_java.m4
@@ -184,6 +184,11 @@ AC_DEFUN([OPAL_SETUP_JAVA],[
                           # too.  Ugh.
                           AS_IF([test -d "$with_jdk_headers/solaris"],
                                 [OPAL_JDK_CPPFLAGS="$OPAL_JDK_CPPFLAGS -I$with_jdk_headers/solaris"])
+                          # Darwin JDK also require -I<blah>/darwin.
+                          # See if that's there, and if so, add a -I for that,
+                          # too.  Ugh.
+                          AS_IF([test -d "$with_jdk_headers/darwin"],
+                                [OPAL_JDK_CPPFLAGS="$OPAL_JDK_CPPFLAGS -I$with_jdk_headers/darwin"])
 
                           CPPFLAGS="$CPPFLAGS $OPAL_JDK_CPPFLAGS"])
                    AC_CHECK_HEADER([jni.h], [],