The branch, master has been updated via a3d04991ef409591a7c8b9fbb01e024bd5aaa041 (commit) via e8aa7169a6672bd32af6c5580f6e8ec7e99511bc (commit) from 8dd1faaa2992851f6852ba7ea4498445af5faadd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041 Author: Timur <ti...@freebsd.org> Date: Tue Mar 17 22:46:53 2009 +0100 build: fix detection of netinet/ip.h on FreeBSD Signed-off-by: Michael Adam <ob...@samba.org> commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc Author: Timur <ti...@freebsd.org> Date: Tue Mar 17 22:45:28 2009 +0100 build: format the header check for netinet/ip.h more nicely Signed-off-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/replace/libreplace_network.m4 | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4 index 9223d94..3bac72d 100644 --- a/lib/replace/libreplace_network.m4 +++ b/lib/replace/libreplace_network.m4 @@ -8,12 +8,15 @@ 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 <netinet/in.h> -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -#include <netinet/in_systm.h> -#endif]) +AC_CHECK_HEADERS([netinet/ip.h], [], [],[ + #include <sys/types.h> + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + #include <netinet/in_systm.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) -- Samba Shared Repository