build-sys: check for afunix.h

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 01c80437eefaca5745faf26aea4a3a6b28562e17..17b2e201dbf818eebe3b1d896a906ac9be811998 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -6,6 +6,7 @@ include(CheckTypeSize)
 include(CheckCSourceCompiles)
 include(CheckCSourceRuns)
 
+check_include_files("winsock2.h;afunix.h"   HAVE_AFUNIX_H)
 check_include_file(alloca.h     HAVE_ALLOCA_H)
 check_include_file(byteswap.h     HAVE_BYTESWAP_H)
 check_include_file(crt/externs.h     HAVE_CRT_EXTERNS_H)

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 75509524ed4a09e6a90c47f9923eb323114d34c8..b70f8390d0f09adf5059cfd96ab99a8d9339436e 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -94,6 +94,7 @@
 #cmakedefine GLIB_VERSION_MAX_ALLOWED  @GLIB_VERSION_MAX_ALLOWED@
 
 // headers
+#cmakedefine HAVE_AFUNIX_H 1
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_BYTESWAP_H 1
 #cmakedefine HAVE_CRT_EXTERNS_H 1

diff --git a/configure.ac b/configure.ac
index d72d8f7c8b4f8d06f968d45334ddc497a84ff24f..0c5cdfeab165b3a19c5e64ba20456977b23de344 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -430,6 +430,7 @@ sys/syscall.h
 sys/syslimits.h
 sys/time.h
 unistd.h
+winsock2.h
 ws2tcpip.h
 ])
 
@@ -1052,6 +1053,13 @@ if test x$dbus_win = xyes ; then
   fi
 fi
 
+AC_CHECK_HEADERS([afunix.h], [], [],
+  [AC_INCLUDES_DEFAULT[
+   #ifdef HAVE_WINSOCK2_H
+   # include <winsock2.h>
+   #endif
+  ]])
+
 AC_SUBST([NETWORK_libs])
 
 AC_ARG_WITH([valgrind],

diff --git a/meson.build b/meson.build
index 3e11cb006f753b2a76b912df1208a4b4b68a2846..8c45522fb37a71e18c7712166560ede56a019e49 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -607,6 +607,7 @@ foreach function : check_functions
 endforeach
 
 check_headers = [
+    'afunix.h',
     'alloca.h',
     'byteswap.h',
     'crt_externs.h',