[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5144-gddcf947
Michael Adam
obnox at samba.org
Thu Mar 19 11:32:08 GMT 2009
The branch, v3-3-test has been updated
via ddcf94787f59cf682c51010b87d3624bbdd6b4a3 (commit)
via 9baa0c3b119f41c7d65bc13f4f34c6e242ea1abc (commit)
from e1a79d063de536969732b63ed9be24c4fd2aa505 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit ddcf94787f59cf682c51010b87d3624bbdd6b4a3
Author: Timur <timur at 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 <obnox at samba.org>
(cherry picked from commit a3d04991ef409591a7c8b9fbb01e024bd5aaa041)
commit 9baa0c3b119f41c7d65bc13f4f34c6e242ea1abc
Author: Timur <timur at 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 <obnox at samba.org>
(cherry picked from commit e8aa7169a6672bd32af6c5580f6e8ec7e99511bc)
-----------------------------------------------------------------------
Summary of changes:
source/lib/replace/libreplace_network.m4 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4
index 9b921a0..a520c73 100644
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/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)
--
Samba Shared Repository
More information about the samba-cvs
mailing list