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
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
$NetBSD: patch-ac,v 1.1.1.1.6.1 2009/02/05 17:05:38 tron Exp $
--- configure.orig 2009-02-04 09:44:06.000000000 +0900
+++ configure
@@ -8251,11 +8251,13 @@ for ac_header in sys/types.h \
libc.h \
linux/netfilter_ipv4.h \
linux/netfilter_ipv4/ip_tproxy.h \
+ machine/byte_swap.h \
malloc.h \
math.h \
memory.h \
mount.h \
net/if.h \
+ net/pf/pfvar.h \
net/pfvar.h \
netdb.h \
netinet/if_ether.h \
@@ -22934,98 +22936,25 @@ _ACEOF
fi
-{ $as_echo "$as_me:$LINENO: checking for fd_mask" >&5
-$as_echo_n "checking for fd_mask... " >&6; }
-if test "${ac_cv_type_fd_mask+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5
+$as_echo_n "checking for fd_set... " >&6; }
+if test "${ac_cv_have_fd_mask+set}" = set; then
$as_echo_n "(cached) " >&6
else
- ac_cv_type_fd_mask=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* What a mess.. many systems have added the (now standard) bit types
- * in their own ways, so we need to scan a wide variety of headers to
- * find them..
- */
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
-
-int
-main ()
-{
-if (sizeof (fd_mask))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-
-/* What a mess.. many systems have added the (now standard) bit types
- * in their own ways, so we need to scan a wide variety of headers to
- * find them..
- */
#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
-
+#include <sys/time.h>
+#include <sys/unistd.h>
int
main ()
{
-if (sizeof ((fd_mask)))
- return 0;
+fd_mask fds;
;
return 0;
}
@@ -23048,38 +22977,21 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_fd_mask=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_have_fd_mask="yes"
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ ac_cv_have_fd_mask="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5
-$as_echo "$ac_cv_type_fd_mask" >&6; }
-if test $ac_cv_type_fd_mask = yes; then
- :
-else
-cat >>confdefs.h <<_ACEOF
-#define fd_mask int
-_ACEOF
fi
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5
+$as_echo "$ac_cv_have_fd_mask" >&6; }
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -26304,8 +26216,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
2.95.[123])
- echo "Removing -O for gcc on $host with GCC $GCCVER"
- CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
+ echo "Making -O\[2-9\] to -O for gcc on $host with GCC $GCCVER"
+ CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*/-O/'`"
;;
esac
fi
@@ -27437,7 +27349,7 @@ if test "$PF_TRANSPARENT" ; then
{ $as_echo "$as_me:$LINENO: checking if PF header file is installed" >&5
$as_echo_n "checking if PF header file is installed... " >&6; }
# hold on to your hats...
- if test "$ac_cv_header_net_pfvar_h" = "yes"; then
+ if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then
PF_TRANSPARENT="yes"
cat >>confdefs.h <<\_ACEOF
|
