From: Michael Adam <obnox@samba.org>
Date: Tue, 27 Jan 2009 11:37:13 +0000 (+0100)
Subject: libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
X-Git-Tag: samba-3.0.36~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf2432428342c6702cf9ed0d38a34d8ff4ed0a36;p=thirdparty%2Fsamba.git

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

under solaris

Michael
(cherry picked from commit d09c9b459638242b9df53cc82a8849699d572486)
---

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index e430a7f1518..d41a86450d4 100644
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -97,7 +97,10 @@ AC_CHECK_HEADERS(sys/syslog.h syslog.h)
 AC_CHECK_HEADERS(sys/time.h time.h)
 AC_CHECK_HEADERS(stdarg.h vararg.h)
 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)
 AC_CHECK_HEADERS(stropts.h)