From 082bea67af9df2390a422a5b2e9d1a042dd95c10 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Mar 2009 08:05:11 +0100 Subject: lib/replace: make sure we include before socket_wrapper.h This should fix the build on some hosts. metze --- lib/replace/libreplace_network.m4 | 1 + lib/replace/system/network.h | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'lib/replace') diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4 index 78fb1abaf0..1dc1c44ed8 100644 --- a/lib/replace/libreplace_network.m4 +++ b/lib/replace/libreplace_network.m4 @@ -16,6 +16,7 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H #endif]) AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h) AC_CHECK_HEADERS(sys/sockio.h sys/un.h) +AC_CHECK_HEADERS(sys/uio.h) dnl we need to check that net/if.h really can be used, to cope with hpux dnl where including it always fails diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index f135d175d4..6add99c0db 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -83,6 +83,10 @@ #include #endif +#ifdef HAVE_SYS_UIO_H +#include +#endif + #ifdef HAVE_STROPTS_H #include #endif -- cgit From 099d6f05cdb0800114d026786920a17ef649699f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 13 Mar 2009 10:20:29 +0100 Subject: lib/replace: use AC_TRY_LINK() to verify that getifaddrs() and freeifaddrs() are available metze --- lib/replace/libreplace_network.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/replace') diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4 index 1dc1c44ed8..9223d94b75 100644 --- a/lib/replace/libreplace_network.m4 +++ b/lib/replace/libreplace_network.m4 @@ -242,7 +242,7 @@ AC_CHECK_MEMBERS([struct sockaddr.sa_len], dnl test for getifaddrs and freeifaddrs AC_CACHE_CHECK([for getifaddrs and freeifaddrs],libreplace_cv_HAVE_GETIFADDRS,[ -AC_TRY_COMPILE([ +AC_TRY_LINK([ #include #if STDC_HEADERS #include -- cgit From e8aa7169a6672bd32af6c5580f6e8ec7e99511bc Mon Sep 17 00:00:00 2001 From: Timur Date: Tue, 17 Mar 2009 22:45:28 +0100 Subject: build: format the header check for netinet/ip.h more nicely Signed-off-by: Michael Adam --- lib/replace/libreplace_network.m4 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/replace') diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4 index 9223d94b75..a87320f841 100644 --- a/lib/replace/libreplace_network.m4 +++ b/lib/replace/libreplace_network.m4 @@ -8,12 +8,14 @@ LIBREPLACE_NETWORK_LIBS="" AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h) AC_CHECK_HEADERS(netinet/in_systm.h) -AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -#include -#endif]) +AC_CHECK_HEADERS([netinet/ip.h], [], [],[ + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + #include + #endif +]) AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h) AC_CHECK_HEADERS(sys/sockio.h sys/un.h) AC_CHECK_HEADERS(sys/uio.h) -- cgit From a3d04991ef409591a7c8b9fbb01e024bd5aaa041 Mon Sep 17 00:00:00 2001 From: Timur Date: Tue, 17 Mar 2009 22:46:53 +0100 Subject: build: fix detection of netinet/ip.h on FreeBSD Signed-off-by: Michael Adam --- lib/replace/libreplace_network.m4 | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/replace') diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4 index a87320f841..3bac72d136 100644 --- a/lib/replace/libreplace_network.m4 +++ b/lib/replace/libreplace_network.m4 @@ -9,6 +9,7 @@ LIBREPLACE_NETWORK_LIBS="" AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h) AC_CHECK_HEADERS(netinet/in_systm.h) AC_CHECK_HEADERS([netinet/ip.h], [], [],[ + #include #ifdef HAVE_NETINET_IN_H #include #endif -- cgit