summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad comstyle com>2012-09-03 10:12:02 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-09-03 10:12:02 +0100
commit712f148205c007e8b1de6e2e889e8257b69ca6af (patch)
tree929d5c22496a81dcb3e298d5a850a86be98c56a2
parentdddedfa27db3afab96cba443d07ee81594817a01 (diff)
downloaddbus-712f148205c007e8b1de6e2e889e8257b69ca6af.tar.gz
Detect MSG_NOSIGNAL and SCM_RIGHTS on OpenBSD
On OpenBSD, sys/socket.h requires sys/types.h to be included first. Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54418
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index e8fc1aef..2e34f565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -766,7 +766,8 @@ dnl needed on darwin for NAME_MAX
AC_CHECK_HEADERS(sys/syslimits.h)
dnl Make it easy to check if we have MSG_NOSIGNAL without actually having to include sys/socket.h
-AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include <sys/socket.h> ]])
+AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include <sys/types.h>
+#include <sys/socket.h> ]])
dnl check for flavours of varargs macros (test from GLib)
AC_MSG_CHECKING(for ISO C99 varargs macros in C)
@@ -1220,6 +1221,7 @@ AC_SUBST([ADT_LIBS])
# Check for SCM_RIGHTS
AC_MSG_CHECKING([for SCM_RIGHTS])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
static int x = SCM_RIGHTS;