]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 2196: configure: net*/*.h present but cannot be compiled
authorAmos Jeffries <amosjeffries@squid-cache.org>
Wed, 7 May 2008 07:50:28 +0000 (01:50 -0600)
committerAmos Jeffries <amosjeffries@squid-cache.org>
Wed, 7 May 2008 07:50:28 +0000 (01:50 -0600)
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.

configure.in

index 5ed54c90e09192c026662dd48aa346f41933c96b..625536045ec54d9f9e94da265b940a09a8ef74a1 100644 (file)
@@ -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"