1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
--- configure.orig 2014-08-27 18:17:55.000000000 +0400
+++ configure 2014-08-27 21:14:17.000000000 +0400
@@ -11856,7 +11856,7 @@
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1.*)
ld_shlibs=no
;;
@@ -11872,7 +11872,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
@@ -12778,7 +12778,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -12789,7 +12789,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -12807,7 +12807,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14673,7 +14673,7 @@
esac
;;
- freebsd[12]*)
+ freebsd[12].*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -16441,7 +16441,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -16452,7 +16452,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -16470,7 +16470,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -18550,7 +18550,7 @@
squid_cv_cc_arg_pipe=""
;;
clang)
- squid_cv_cxx_option_werror="-Werror -Qunused-arguments"
+ squid_cv_cxx_option_werror="-Qunused-arguments"
squid_cv_cc_option_werror="$squid_cv_cxx_option_werror"
squid_cv_cc_option_wall="-Wall"
squid_cv_cc_option_optimize="-O2"
@@ -22964,7 +22964,7 @@
done
- if test "x$ac_heimdal" == "x" ; then
+ if test "x$ac_heimdal" = "x" ; then
for ac_header in gssapi/gssapi_generic.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default"
@@ -23161,7 +23161,7 @@
ac_com_error_message=no
- if test "x$ac_cv_header_com_err_h" == "xyes" ; then
+ if test "x$ac_cv_header_com_err_h" = "xyes" ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <com_err.h>
@@ -23173,7 +23173,7 @@
fi
rm -f conftest*
- elif test "x$ac_cv_header_et_com_err_h" == "xyes" ; then
+ elif test "x$ac_cv_header_et_com_err_h" = "xyes" ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <et/com_err.h>
@@ -23234,7 +23234,7 @@
fi
- if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" == "xyes" ; then
+ if test `echo $KRB5LIBS | grep -c com_err` -ne 0 -a "x$ac_com_error_message" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lcom_err" >&5
$as_echo_n "checking for error_message in -lcom_err... " >&6; }
if ${ac_cv_lib_com_err_error_message+:} false; then :
@@ -23277,7 +23277,7 @@
fi
- elif test "x$ac_com_error_message" == "xyes" ; then
+ elif test "x$ac_com_error_message" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_message in -lkrb5" >&5
$as_echo_n "checking for error_message in -lkrb5... " >&6; }
if ${ac_cv_lib_krb5_error_message+:} false; then :
@@ -24870,6 +24870,7 @@
cassert \
crypt.h \
cstdarg \
+ cstdio \
cstdlib \
cstring \
list \
@@ -25178,12 +25179,12 @@
#if HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
-#if HAVE_NETINET_IP_COMPAT_H
-#include <netinet/ip_compat.h>
-#endif
#if HAVE_NET_IF_H
#include <net/if.h>
#endif
+#if HAVE_NETINET_IP_COMPAT_H
+#include <netinet/ip_compat.h>
+#endif
#if HAVE_NETINET_IP_FIL_H
#include <netinet/ip_fil.h>
#endif
|