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

[Michael Adam]

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

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


- Log -----------------------------------------------------------------
commit 74534203b5b91445cd8ae4cd7f2a0d35ea73a281
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 27 12:13:55 2009 +0100

    libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
    
    under solaris
    
    Michael
    (cherry picked from commit 1b7beaed69823b3c401bc4c0b1c502b671169168)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 source/lib/replace/libreplace_network.m4 |    5 ++++-
 1 files changed, 4 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 4edb55c..5fc62fd 100644
--- a/source/lib/replace/libreplace_network.m4
+++ b/source/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