[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3401-gac4d07e

[Michael Adam]

The branch, v3-2-test has been updated
       via  ac4d07ef8300a2b571296b8b3f7c23e8850b526a (commit)
      from  74534203b5b91445cd8ae4cd7f2a0d35ea73a281 (commit)

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


- Log -----------------------------------------------------------------
commit ac4d07ef8300a2b571296b8b3f7c23e8850b526a
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 27 15:48:20 2009 +0100

    libreplace: fix detection of netinet/ip.h on solaris 8
    
    (The test needs to additionally include <netinet/in_systm.h>.)
    
    Michael
    (cherry picked from commit a223b096700bc54b446a0e152c842b088566720b)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/libreplace_network.m4 b/source/lib/replace/libreplace_network.m4
index 5fc62fd..5d16459 100644
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/lib/replace/libreplace_network.m4
@@ -7,10 +7,14 @@ LIBREPLACE_NETWORK_OBJS=""
 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/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS(netinet/tcp.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