From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Wed, 7 May 2008 07:50:28 +0000 (-0600)
Subject: Bug 2196: configure: net*/*.h present but cannot be compiled
X-Git-Tag: SQUID_3_1_0_1~49^2~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e5191ee3e27683bb5009cb8544cb3ac7f840a7;p=thirdparty%2Fsquid.git

Bug 2196: configure: net*/*.h present but cannot be compiled

This moves critical net*/*.h file tests from the general location
and use testign to the *BSD special testing which accounts for
system file dependencies.

TODO: some files are still missing dependencies even with the *BSD test
      their brokenness will be fixed at a later point.
---

diff --git a/configure.in b/configure.in
index 5ed54c90e0..625536045e 100644
--- a/configure.in
+++ b/configure.in
@@ -2107,15 +2107,9 @@ AC_CHECK_HEADERS( \
 	math.h \
 	memory.h \
 	mount.h \
-	net/if.h \
-	net/pfvar.h \
 	netdb.h \
 	netinet/in.h \
-	netinet/icmp6.h \
 	netinet/in_systm.h \
-	netinet/ip.h \
-	netinet/ip6.h \
-	netinet/ip_icmp.h \
 	netinet/ip_fil_compat.h \
 	openssl/err.h \
 	openssl/md5.h \
@@ -2183,14 +2177,24 @@ SQUID_DEFAULT_INCLUDES
 #endif
 )
 
-AC_CHECK_HEADERS(net/if.h \
+dnl *BSD dont include the depenencies for all their net/ and netinet/ files
+dns We must include a few basic type headers for them to work.
+AC_CHECK_HEADERS( \
+	net/if.h \
 	netinet/if_ether.h\
+	netinet/icmp6.h \
+	netinet/ip.h \
+	netinet/ip6.h \
 	netinet/ip_compat.h\
 	netinet/ip_fil.h\
+	netinet/ip_icmp.h \
 	netinet/ip_nat.h\
 	netinet/ipl.h \
+	net/pfvar.h \
 	sys/mount.h\
-	resolv.h,,,SQUID_BSDNET_INCLUDES)
+	resolv.h \
+,,,
+SQUID_BSDNET_INCLUDES)
 
 AC_CHECK_HEADERS([libxml/parser.h], [], [
     	SAVED_CPPFLAGS="$CPPFLAGS"