detect resolv.h and sys/moun.h correctly on *BSD

diff --git a/acinclude.m4 b/acinclude.m4
index 142a116948f310b8e2aeb336233f5c3a0defb98d..f705f071e40e20fec5772aadd16cd1ed0fad552c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -48,4 +48,7 @@ SQUID_DEFAULT_INCLUDES
 #if HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 ])

diff --git a/aclocal.m4 b/aclocal.m4
index 16e1779b6bf38d3a0fd6876ee99ae4aa85a9e73b..24a71f215e174a36d0ec1cdd1084740cb31110ed 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -61,6 +61,9 @@ SQUID_DEFAULT_INCLUDES
 #if HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 ])
 
 # Do all the work for Automake.                            -*- Autoconf -*-

diff --git a/configure b/configure
index 2ed712761a70703bc8a6ea95168180a03f95e79b..dc646fda4e603811ed0f930418a833a6ca3ce9d2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.340 .
+# From configure.in Revision: 1.341 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -7397,8 +7397,6 @@ done
 
 
 
-
-
 
 
 
@@ -7437,7 +7435,6 @@ for ac_header in \
        poll.h \
        pwd.h \
        regex.h \
-       resolv.h \
        sched.h \
        signal.h \
        stdarg.h \
@@ -7449,9 +7446,8 @@ for ac_header in \
        sys/bitypes.h \
        sys/file.h \
        sys/ioctl.h \
-       sys/mount.h \
-       sys/msg.h \
        sys/param.h \
+       sys/msg.h \
        sys/resource.h \
        sys/select.h\
        sys/socket.h \
@@ -7702,11 +7698,15 @@ done
 
 
 
+
+
 for ac_header in net/if.h \
        netinet/if_ether.h\
        netinet/ip_compat.h\
        netinet/ip_fil.h\
-       netinet/ip_nat.h
+       netinet/ip_nat.h\
+       sys/mount.h\
+       resolv.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -7760,6 +7760,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 #if HAVE_NET_IF_H
 #include <net/if.h>
 #endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 
 
 #include <$ac_header>

diff --git a/configure.in b/configure.in
index 1cb170671f1ec7ff33b8b77bce9ad1cf2cd43185..9f4c8c649f2fb26db47d24dc4d2932a98ad4051a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.341 2003/07/28 13:01:55 robertc Exp $
+dnl  $Id: configure.in,v 1.342 2003/07/28 20:41:05 robertc Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE2-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.341 $)dnl
+AC_REVISION($Revision: 1.342 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1465,7 +1465,6 @@ AC_CHECK_HEADERS( \
        poll.h \
        pwd.h \
        regex.h \
-       resolv.h \
        sched.h \
        signal.h \
        stdarg.h \
@@ -1477,9 +1476,8 @@ AC_CHECK_HEADERS( \
        sys/bitypes.h \
        sys/file.h \
        sys/ioctl.h \
-       sys/mount.h \
-       sys/msg.h \
        sys/param.h \
+       sys/msg.h \
        sys/resource.h \
        sys/select.h\
        sys/socket.h \
@@ -1517,7 +1515,9 @@ AC_CHECK_HEADERS(net/if.h \
        netinet/if_ether.h\
        netinet/ip_compat.h\
        netinet/ip_fil.h\
-       netinet/ip_nat.h,,,SQUID_BSDNET_INCLUDES)
+       netinet/ip_nat.h\
+       sys/mount.h\
+       resolv.h,,,SQUID_BSDNET_INCLUDES)
 
 AC_C_CONST
 AC_C_BIGENDIAN