squid-3.0.PRE3-mount-sys-detection.patch

   1 Index: squid3/aclocal.m4
   2 diff -c squid3/aclocal.m4:1.35 squid3/aclocal.m4:1.36
   3 *** squid3/aclocal.m4:1.35      Mon Aug 18 18:20:25 2003
   4 --- squid3/aclocal.m4   Sat Aug 30 03:14:37 2003
   5 ***************
   6 *** 46,51 ****
   7 --- 46,54 ----
   8   dnl *BSD net headers
   9   AC_DEFUN(SQUID_BSDNET_INCLUDES,[
  10   SQUID_DEFAULT_INCLUDES
  11 + #if HAVE_SYS_TIME_H
  12 + #include <sys/time.h>
  13 + #endif
  14   #if HAVE_SYS_SOCKET_H
  15   #include <sys/socket.h>
  16   #endif
  17 ***************
  18 *** 55,65 ****
  19   #if HAVE_NETINET_IP_COMPAT_H
  20   #include <netinet/ip_compat.h>
  21   #endif
  22 - #if HAVE_NETINET_IP_FIL_H
  23 - #include <netinet/ip_fil.h>
  24 - #endif
  25   #if HAVE_NET_IF_H
  26   #include <net/if.h>
  27   #endif
  28   #if HAVE_SYS_PARAM_H
  29   #include <sys/param.h>
  30 --- 58,68 ----
  31   #if HAVE_NETINET_IP_COMPAT_H
  32   #include <netinet/ip_compat.h>
  33   #endif
  34   #if HAVE_NET_IF_H
  35   #include <net/if.h>
  36 + #endif
  37 + #if HAVE_NETINET_IP_FIL_H
  38 + #include <netinet/ip_fil.h>
  39   #endif
  40   #if HAVE_SYS_PARAM_H
  41   #include <sys/param.h>
  42 Index: squid3/configure
  43 diff -c squid3/configure:1.368 squid3/configure:1.369
  44 *** squid3/configure:1.368      Mon Aug 18 18:20:25 2003
  45 --- squid3/configure    Sat Aug 30 03:14:37 2003
  46 ***************
  47 *** 7782,7787 ****
  48 --- 7782,7790 ----
  49   #include <sys/select.h>
  50   #endif
  51
  52 + #if HAVE_SYS_TIME_H
  53 + #include <sys/time.h>
  54 + #endif
  55   #if HAVE_SYS_SOCKET_H
  56   #include <sys/socket.h>
  57   #endif
  58 ***************
  59 *** 7791,7801 ****
  60   #if HAVE_NETINET_IP_COMPAT_H
  61   #include <netinet/ip_compat.h>
  62   #endif
  63 - #if HAVE_NETINET_IP_FIL_H
  64 - #include <netinet/ip_fil.h>
  65 - #endif
  66   #if HAVE_NET_IF_H
  67   #include <net/if.h>
  68   #endif
  69   #if HAVE_SYS_PARAM_H
  70   #include <sys/param.h>
  71 --- 7794,7804 ----
  72   #if HAVE_NETINET_IP_COMPAT_H
  73   #include <netinet/ip_compat.h>
  74   #endif
  75   #if HAVE_NET_IF_H
  76   #include <net/if.h>
  77 + #endif
  78 + #if HAVE_NETINET_IP_FIL_H
  79 + #include <netinet/ip_fil.h>
  80   #endif
  81   #if HAVE_SYS_PARAM_H
  82   #include <sys/param.h>
  83 Index: squid3/acinclude.m4
  84 diff -c squid3/acinclude.m4:1.9 squid3/acinclude.m4:1.10
  85 *** squid3/acinclude.m4:1.9     Mon Aug 18 18:15:01 2003
  86 --- squid3/acinclude.m4 Sat Aug 30 03:08:21 2003
  87 ***************
  88 *** 33,38 ****
  89 --- 33,41 ----
  90   dnl *BSD net headers
  91   AC_DEFUN(SQUID_BSDNET_INCLUDES,[
  92   SQUID_DEFAULT_INCLUDES
  93 + #if HAVE_SYS_TIME_H
  94 + #include <sys/time.h>
  95 + #endif
  96   #if HAVE_SYS_SOCKET_H
  97   #include <sys/socket.h>
  98   #endif
  99 ***************
 100 *** 42,52 ****
 101   #if HAVE_NETINET_IP_COMPAT_H
 102   #include <netinet/ip_compat.h>
 103   #endif
 104 - #if HAVE_NETINET_IP_FIL_H
 105 - #include <netinet/ip_fil.h>
 106 - #endif
 107   #if HAVE_NET_IF_H
 108   #include <net/if.h>
 109   #endif
 110   #if HAVE_SYS_PARAM_H
 111   #include <sys/param.h>
 112 --- 45,55 ----
 113   #if HAVE_NETINET_IP_COMPAT_H
 114   #include <netinet/ip_compat.h>
 115   #endif
 116   #if HAVE_NET_IF_H
 117   #include <net/if.h>
 118 + #endif
 119 + #if HAVE_NETINET_IP_FIL_H
 120 + #include <netinet/ip_fil.h>
 121   #endif
 122   #if HAVE_SYS_PARAM_H
 123   #include <sys/param.h>