Skip to content

Commit f95f11d

Browse files
author
rhc54
authored
Merge pull request #2534 from rhc54/topic/pmixconfig
Update pmix check headers to support Open BSD
2 parents 1635c29 + d51821c commit f95f11d

File tree

1 file changed

+32
-1
lines changed
  • opal/mca/pmix/pmix2x/pmix/config

1 file changed

+32
-1
lines changed

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
313313

314314
AC_CHECK_HEADERS([arpa/inet.h \
315315
fcntl.h ifaddrs.h inttypes.h libgen.h \
316-
net/if.h net/uio.h netinet/in.h \
316+
net/uio.h netinet/in.h \
317317
stdint.h stddef.h \
318318
stdlib.h string.h strings.h \
319319
sys/ioctl.h sys/param.h \
@@ -327,6 +327,37 @@ AC_DEFUN([PMIX_SETUP_CORE],[
327327
sys/statfs.h sys/statvfs.h \
328328
netdb.h ucred.h])
329329

330+
AC_CHECK_HEADERS([sys/mount.h], [], [],
331+
[AC_INCLUDES_DEFAULT
332+
#if HAVE_SYS_PARAM_H
333+
#include <sys/param.h>
334+
#endif
335+
])
336+
337+
AC_CHECK_HEADERS([sys/sysctl.h], [], [],
338+
[AC_INCLUDES_DEFAULT
339+
#if HAVE_SYS_PARAM_H
340+
#include <sys/param.h>
341+
#endif
342+
])
343+
344+
# Needed to work around Darwin requiring sys/socket.h for
345+
# net/if.h
346+
AC_CHECK_HEADERS([net/if.h], [], [],
347+
[#include <stdio.h>
348+
#if STDC_HEADERS
349+
# include <stdlib.h>
350+
# include <stddef.h>
351+
#else
352+
# if HAVE_STDLIB_H
353+
# include <stdlib.h>
354+
# endif
355+
#endif
356+
#if HAVE_SYS_SOCKET_H
357+
# include <sys/socket.h>
358+
#endif
359+
])
360+
330361
# Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
331362
# have both Portland and GNU installed; using pgcc will find GNU's
332363
# <stdbool.h>, which all it does -- by standard -- is define "bool" to

0 commit comments

Comments
 (0)