[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-154-gcdab2a4

[Michael Adam]

The branch, master has been updated
       via  cdab2a412790c50feea754f5cfc4fe8b503e4b32 (commit)
      from  692b63e93a19b1226669ff51a77484dbc50926d0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cdab2a412790c50feea754f5cfc4fe8b503e4b32
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 27 12:11:49 2009 +0100

    libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
    
    under solaris
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/libreplace_network.m4 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index 4edb55c..8d8379a 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -7,7 +7,10 @@ LIBREPLACE_NETWORK_OBJS=""
 LIBREPLACE_NETWORK_LIBS=""
 
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
-AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS([netinet/ip.h], [], [],[#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+AC_CHECK_HEADERS(netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
 
 dnl we need to check that net/if.h really can be used, to cope with hpux


-- 
Samba Shared Repository