[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-457-g28f233d

[Michael Adam]

The branch, v3-4-test has been updated
       via  28f233ddc010893f50b45f91ce41deaa537f11d7 (commit)
       via  46559e7b84d70f7c9e52673365303d0f7863d839 (commit)
      from  2ef50dfeaca50ce85ed867764b050276fe2c924c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 28f233ddc010893f50b45f91ce41deaa537f11d7
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 46559e7b84d70f7c9e52673365303d0f7863d839
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:
 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