Merge pull request #2534 from rhc54/topic/pmixconfig

Update pmix check headers to support Open BSD

opal/mca/pmix/pmix2x/pmix/config/pmix.m4

@@ -313,7 +313,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     AC_CHECK_HEADERS([arpa/inet.h \
                       fcntl.h ifaddrs.h inttypes.h libgen.h \
-                      net/if.h net/uio.h netinet/in.h \
+                      net/uio.h netinet/in.h \
                       stdint.h stddef.h \
                       stdlib.h string.h strings.h \
                       sys/ioctl.h sys/param.h \
@@ -327,6 +327,37 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                       sys/statfs.h sys/statvfs.h \
                       netdb.h ucred.h])
 
+    AC_CHECK_HEADERS([sys/mount.h], [], [],
+                    [AC_INCLUDES_DEFAULT
+                     #if HAVE_SYS_PARAM_H
+                     #include <sys/param.h>
+                     #endif
+                     ])
+
+    AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+                     [AC_INCLUDES_DEFAULT
+                      #if HAVE_SYS_PARAM_H
+                      #include <sys/param.h>
+                      #endif
+                      ])
+
+    # Needed to work around Darwin requiring sys/socket.h for
+    # net/if.h
+    AC_CHECK_HEADERS([net/if.h], [], [],
+                     [#include <stdio.h>
+                      #if STDC_HEADERS
+                      # include <stdlib.h>
+                      # include <stddef.h>
+                      #else
+                      # if HAVE_STDLIB_H
+                      #  include <stdlib.h>
+                      # endif
+                      #endif
+                      #if HAVE_SYS_SOCKET_H
+                      # include <sys/socket.h>
+                      #endif
+                      ])
+
     # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
     # have both Portland and GNU installed; using pgcc will find GNU's
     # <stdbool.h>, which all it does -- by standard -- is define "bool" to