diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-05-29 21:51:58 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-05-30 11:28:57 +0200 |
commit | 161866e8c5c0fca6096024e06483793d4846c68d (patch) | |
tree | f96f583837d6711d430ca379524ba4efea3f7b02 /meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch | |
parent | 0ae4f065701c045860163ce5448d8dd04427fe1e (diff) | |
download | meta-openembedded-161866e8c5c0fca6096024e06483793d4846c68d.tar.gz |
socat: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch')
-rw-r--r-- | meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch | 939 |
1 files changed, 939 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch b/meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch new file mode 100644 index 000000000..35a1e3188 --- /dev/null +++ b/meta-oe/recipes-support/socat/socat-1.7.1.2/compile.patch | |||
@@ -0,0 +1,939 @@ | |||
1 | Index: socat-1.7.1.2/configure.in | ||
2 | =================================================================== | ||
3 | --- socat-1.7.1.2.orig/configure.in 2010-03-17 10:10:07.431327912 +0800 | ||
4 | +++ socat-1.7.1.2/configure.in 2010-03-17 11:30:56.010077501 +0800 | ||
5 | @@ -86,7 +86,7 @@ | ||
6 | |||
7 | |||
8 | dnl Check for extra socket library (for Solaris) | ||
9 | -AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR)])) | ||
10 | +AC_CHECK_FUNC(hstrerror, , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])])) | ||
11 | AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent)) | ||
12 | AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) | ||
13 | |||
14 | @@ -100,7 +100,7 @@ | ||
15 | [sc_cv_have_prototype_hstrerror=yes]); | ||
16 | CFLAGS="$CFLAGS1"]) | ||
17 | if test $sc_cv_have_prototype_hstrerror = yes; then | ||
18 | - AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR) | ||
19 | + AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror]) | ||
20 | fi | ||
21 | AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) | ||
22 | |||
23 | @@ -109,83 +109,83 @@ | ||
24 | AC_ARG_ENABLE(help, [ --disable-help disable help], | ||
25 | [case "$enableval" in | ||
26 | no) AC_MSG_RESULT(no);; | ||
27 | - *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);; | ||
28 | + *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);; | ||
29 | esac], | ||
30 | - [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)]) | ||
31 | + [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)]) | ||
32 | |||
33 | AC_MSG_CHECKING(whether to include STDIO support) | ||
34 | AC_ARG_ENABLE(stdio, [ --disable-stdio disable STDIO support], | ||
35 | [case "$enableval" in | ||
36 | no) AC_MSG_RESULT(no);; | ||
37 | - *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);; | ||
38 | + *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);; | ||
39 | esac], | ||
40 | - [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)]) | ||
41 | + [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)]) | ||
42 | |||
43 | AC_MSG_CHECKING(whether to include FD-number support) | ||
44 | AC_ARG_ENABLE(fdnum, [ --disable-fdnum disable FD-number support], | ||
45 | [case "$enableval" in | ||
46 | no) AC_MSG_RESULT(no);; | ||
47 | - *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);; | ||
48 | + *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);; | ||
49 | esac], | ||
50 | - [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)]) | ||
51 | + [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)]) | ||
52 | |||
53 | AC_MSG_CHECKING(whether to include direct file support) | ||
54 | AC_ARG_ENABLE(file, [ --disable-file disable direct file support], | ||
55 | [case "$enableval" in | ||
56 | no) AC_MSG_RESULT(no);; | ||
57 | - *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);; | ||
58 | + *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);; | ||
59 | esac], | ||
60 | - [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)]) | ||
61 | + [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)]) | ||
62 | |||
63 | AC_MSG_CHECKING(whether to include direct create support) | ||
64 | AC_ARG_ENABLE(creat, [ --disable-creat disable direct create support], | ||
65 | [case "$enableval" in | ||
66 | no) AC_MSG_RESULT(no);; | ||
67 | - *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);; | ||
68 | + *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);; | ||
69 | esac], | ||
70 | - [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)]) | ||
71 | + [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)]) | ||
72 | |||
73 | AC_MSG_CHECKING(whether to include gopen support) | ||
74 | AC_ARG_ENABLE(gopen, [ --disable-gopen disable open for UNIX socket support], | ||
75 | [case "$enableval" in | ||
76 | no) AC_MSG_RESULT(no);; | ||
77 | - *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);; | ||
78 | + *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);; | ||
79 | esac], | ||
80 | - [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)]) | ||
81 | + [AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes)]) | ||
82 | |||
83 | AC_MSG_CHECKING(whether to include explicit pipe support) | ||
84 | AC_ARG_ENABLE(pipe, [ --disable-pipe disable pipe support], | ||
85 | [case "$enableval" in | ||
86 | no) AC_MSG_RESULT(no);; | ||
87 | - *) AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes);; | ||
88 | + *) AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes);; | ||
89 | esac], | ||
90 | - [AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes)]) | ||
91 | + [AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes)]) | ||
92 | |||
93 | AC_MSG_CHECKING(whether to include explicit termios support) | ||
94 | AC_ARG_ENABLE(termios, [ --disable-termios disable termios support], | ||
95 | [case "$enableval" in | ||
96 | no) AC_MSG_RESULT(no);; | ||
97 | - *) AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes);; | ||
98 | + *) AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes);; | ||
99 | esac], | ||
100 | - [AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes)]) | ||
101 | + [AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes)]) | ||
102 | |||
103 | AC_MSG_CHECKING(whether to include UNIX socket support) | ||
104 | AC_ARG_ENABLE(unix, [ --disable-unix disable UNIX domain socket support], | ||
105 | [case "$enableval" in | ||
106 | no) AC_MSG_RESULT(no);; | ||
107 | - *) AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes);; | ||
108 | + *) AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes);; | ||
109 | esac], | ||
110 | - [AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes)]) | ||
111 | + [AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes)]) | ||
112 | |||
113 | AC_MSG_CHECKING(whether to include abstract UNIX socket support) | ||
114 | AC_ARG_ENABLE(abstract_unixsocket, [ --disable-abstract-unixsocket disable abstract UNIX domain socket support], | ||
115 | [case "$enableval" in | ||
116 | no) AC_MSG_RESULT(no);; | ||
117 | - *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);; | ||
118 | + *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);; | ||
119 | esac], | ||
120 | [ case "`uname`" in | ||
121 | Linux) | ||
122 | - AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);; | ||
123 | + AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);; | ||
124 | *) | ||
125 | AC_MSG_RESULT(no);; | ||
126 | esac]) | ||
127 | @@ -194,9 +194,9 @@ | ||
128 | AC_ARG_ENABLE(ip4, [ --disable-ip4 disable IPv4 support], | ||
129 | [case "$enableval" in | ||
130 | no) AC_MSG_RESULT(no);; | ||
131 | - *) AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes);; | ||
132 | + *) AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes);; | ||
133 | esac], | ||
134 | - [AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes)]) | ||
135 | + [AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes)]) | ||
136 | |||
137 | AC_MSG_CHECKING(whether to include IPv6 support) | ||
138 | AC_ARG_ENABLE(ip6, [ --disable-ip6 disable IPv6 support], | ||
139 | @@ -207,7 +207,7 @@ | ||
140 | [ AC_MSG_RESULT(yes); WITH_IP6=1 ]) | ||
141 | if test "$WITH_IP6"; then | ||
142 | AC_CHECK_HEADERS([netinet/ip6.h], | ||
143 | - [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6)], | ||
144 | + [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6, [1], [with ipv6])], | ||
145 | [AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])], | ||
146 | [AC_INCLUDES_DEFAULT | ||
147 | #ifdef HAVE_NETINET_IN_H | ||
148 | @@ -219,17 +219,17 @@ | ||
149 | AC_ARG_ENABLE(rawip, [ --disable-rawip disable raw IP support], | ||
150 | [case "$enableval" in | ||
151 | no) AC_MSG_RESULT(no);; | ||
152 | - *) AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes);; | ||
153 | + *) AC_DEFINE(WITH_RAWIP, [1], [With reawip]) AC_MSG_RESULT(yes);; | ||
154 | esac], | ||
155 | - [AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes)]) | ||
156 | + [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)]) | ||
157 | |||
158 | AC_MSG_CHECKING(whether to include generic socket support) | ||
159 | AC_ARG_ENABLE(rawsocket, [ --disable-genericsocket disable generic socket support], | ||
160 | [case "$enableval" in | ||
161 | no) AC_MSG_RESULT(no);; | ||
162 | - *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);; | ||
163 | + *) AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes);; | ||
164 | esac], | ||
165 | - [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)]) | ||
166 | + [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes)]) | ||
167 | AC_MSG_CHECKING(whether to include raw network interface support) | ||
168 | AC_ARG_ENABLE(interface, [ --disable-interface disable network interface support], | ||
169 | [case "$enableval" in | ||
170 | @@ -239,35 +239,35 @@ | ||
171 | [AC_MSG_RESULT(yes); WITH_INTERFACE=1 ]) | ||
172 | if test "$WITH_INTERFACE"; then | ||
173 | AC_CHECK_HEADER(netpacket/packet.h, | ||
174 | - AC_DEFINE(HAVE_NETPACKET_PACKET_H), | ||
175 | + AC_DEFINE(HAVE_NETPACKET_PACKET_H, [1], [Has packet.h]), | ||
176 | [WITH_INTERFACE=; | ||
177 | AC_MSG_WARN([include file netpacket/packet.h not found, disabling interface])]) | ||
178 | fi | ||
179 | if test "$WITH_INTERFACE"; then | ||
180 | AC_CHECK_HEADER(netinet/if_ether.h, | ||
181 | - AC_DEFINE(HAVE_NETINET_IF_ETHER_H), | ||
182 | + AC_DEFINE(HAVE_NETINET_IF_ETHER_H, [1], [Has if_ether.h]), | ||
183 | [WITH_INTERFACE=; | ||
184 | AC_MSG_WARN([include file netinet/if_ether.h not found, disabling interface])]) | ||
185 | fi | ||
186 | if test "$WITH_INTERFACE"; then | ||
187 | - AC_DEFINE(WITH_INTERFACE) | ||
188 | + AC_DEFINE(WITH_INTERFACE, [1], [Wither interface]) | ||
189 | fi | ||
190 | |||
191 | AC_MSG_CHECKING(whether to include TCP support) | ||
192 | AC_ARG_ENABLE(tcp, [ --disable-tcp disable TCP support], | ||
193 | [case "$enableval" in | ||
194 | no) AC_MSG_RESULT(no);; | ||
195 | - *) AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes);; | ||
196 | + *) AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes);; | ||
197 | esac], | ||
198 | - [AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes)]) | ||
199 | + [AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes)]) | ||
200 | |||
201 | AC_MSG_CHECKING(whether to include UDP support) | ||
202 | AC_ARG_ENABLE(udp, [ --disable-udp disable UDP support], | ||
203 | [case "$enableval" in | ||
204 | no) AC_MSG_RESULT(no);; | ||
205 | - *) AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes);; | ||
206 | + *) AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes);; | ||
207 | esac], | ||
208 | - [AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes)]) | ||
209 | + [AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes)]) | ||
210 | |||
211 | AC_MSG_CHECKING(whether to include SCTP support) | ||
212 | AC_ARG_ENABLE(sctp, [ --disable-sctp disable SCTP support], | ||
213 | @@ -287,7 +287,7 @@ | ||
214 | [sc_cv_define_ipproto_sctp=no])]) | ||
215 | AC_MSG_RESULT($sc_cv_define_ipproto_sctp) | ||
216 | if test $sc_cv_define_ipproto_sctp = yes; then | ||
217 | - AC_DEFINE(WITH_SCTP) | ||
218 | + AC_DEFINE(WITH_SCTP, [1], [With SCTP]) | ||
219 | else | ||
220 | AC_MSG_WARN([IPPROTO_SCTP undefined, disabling SCTP support]) | ||
221 | fi | ||
222 | @@ -297,65 +297,65 @@ | ||
223 | AC_ARG_ENABLE(listen, [ --disable-listen disable listen support], | ||
224 | [case "$enableval" in | ||
225 | no) AC_MSG_RESULT(no);; | ||
226 | - *) AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes);; | ||
227 | + *) AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes);; | ||
228 | esac], | ||
229 | - [AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes)]) | ||
230 | + [AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes)]) | ||
231 | |||
232 | AC_MSG_CHECKING(whether to include socks4 support) | ||
233 | AC_ARG_ENABLE(socks4, [ --disable-socks4 disable socks4 support], | ||
234 | [case "$enableval" in | ||
235 | no) AC_MSG_RESULT(no);; | ||
236 | - *) AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes);; | ||
237 | + *) AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes);; | ||
238 | esac], | ||
239 | - [AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes)]) | ||
240 | + [AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes)]) | ||
241 | |||
242 | AC_MSG_CHECKING(whether to include socks4a support) | ||
243 | AC_ARG_ENABLE(socks4a, [ --disable-socks4a disable socks4a support], | ||
244 | [case "$enableval" in | ||
245 | no) AC_MSG_RESULT(no);; | ||
246 | - *) AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes);; | ||
247 | + *) AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes);; | ||
248 | esac], | ||
249 | - [AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes)]) | ||
250 | + [AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes)]) | ||
251 | |||
252 | AC_MSG_CHECKING(whether to include proxy connect support) | ||
253 | AC_ARG_ENABLE(proxy, [ --disable-proxy disable proxy connect support], | ||
254 | [case "$enableval" in | ||
255 | no) AC_MSG_RESULT(no);; | ||
256 | - *) AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes);; | ||
257 | + *) AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes);; | ||
258 | esac], | ||
259 | - [AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes)]) | ||
260 | + [AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes)]) | ||
261 | |||
262 | AC_MSG_CHECKING(whether to include exec support) | ||
263 | AC_ARG_ENABLE(exec, [ --disable-exec disable exec support], | ||
264 | [case "$enableval" in | ||
265 | no) AC_MSG_RESULT(no);; | ||
266 | - *) AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes);; | ||
267 | + *) AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes);; | ||
268 | esac], | ||
269 | - [AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes)]) | ||
270 | + [AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes)]) | ||
271 | |||
272 | AC_MSG_CHECKING([whether to include system (shell) support]) | ||
273 | AC_ARG_ENABLE(system, [ --disable-system disable system (shell) support], | ||
274 | [case "$enableval" in | ||
275 | no) AC_MSG_RESULT(no);; | ||
276 | - *) AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes);; | ||
277 | + *) AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes);; | ||
278 | esac], | ||
279 | - [AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes)]) | ||
280 | + [AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes)]) | ||
281 | |||
282 | AC_MSG_CHECKING(whether to include pty address support) | ||
283 | AC_ARG_ENABLE(pty, [ --disable-pty disable pty support], | ||
284 | [case "$enableval" in | ||
285 | no) AC_MSG_RESULT(no);; | ||
286 | - *) AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes);; | ||
287 | + *) AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes);; | ||
288 | esac], | ||
289 | - [AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes)]) | ||
290 | + [AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes)]) | ||
291 | |||
292 | AC_MSG_CHECKING(whether to include ext2 fs attributes support) | ||
293 | AC_ARG_ENABLE(ext2, [ --disable-ext2 disable ext2 fs attributes support], | ||
294 | [case "$enableval" in | ||
295 | no) AC_MSG_RESULT(no);; | ||
296 | - *) AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes);; | ||
297 | + *) AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes);; | ||
298 | esac], | ||
299 | - [AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes)]) | ||
300 | + [AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes)]) | ||
301 | |||
302 | AC_MSG_CHECKING(whether to include readline support) | ||
303 | AC_ARG_ENABLE(readline, [ --disable-readline disable readline support], | ||
304 | @@ -400,10 +400,10 @@ | ||
305 | |||
306 | if test -n "$sc_usable_readline_found"; then | ||
307 | AC_MSG_RESULT(yes) | ||
308 | - AC_DEFINE(HAVE_READLINE_READLINE_H,1) | ||
309 | - AC_DEFINE(HAVE_READLINE_HISTORY_H,1) | ||
310 | - AC_DEFINE(HAVE_LIBREADLINE,1) | ||
311 | - AC_DEFINE(WITH_READLINE,1) | ||
312 | + AC_DEFINE(HAVE_READLINE_READLINE_H,1, [have readline]) | ||
313 | + AC_DEFINE(HAVE_READLINE_HISTORY_H,1, [have history]) | ||
314 | + AC_DEFINE(HAVE_LIBREADLINE,1, [have readline]) | ||
315 | + AC_DEFINE(WITH_READLINE,1, [with readline]) | ||
316 | break | ||
317 | else | ||
318 | AC_MSG_RESULT(no) | ||
319 | @@ -446,7 +446,7 @@ | ||
320 | done]) | ||
321 | ]) | ||
322 | if test "$sc_cv_have_openssl_ssl_h" = "yes"; then | ||
323 | - AC_DEFINE(HAVE_OPENSSL_SSL_H) | ||
324 | + AC_DEFINE(HAVE_OPENSSL_SSL_H, [1], [have openssl.h]) | ||
325 | fi | ||
326 | AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h) | ||
327 | fi # end checking for openssl/ssl.h | ||
328 | @@ -478,7 +478,7 @@ | ||
329 | ] | ||
330 | ) | ||
331 | if test "$sc_cv_have_libssl" = 'yes'; then | ||
332 | - AC_DEFINE(HAVE_LIBSSL) | ||
333 | + AC_DEFINE(HAVE_LIBSSL, [1], [libssl]) | ||
334 | fi | ||
335 | AC_MSG_RESULT($sc_cv_have_libssl) | ||
336 | fi | ||
337 | @@ -506,7 +506,7 @@ | ||
338 | #fi | ||
339 | if test -n "$WITH_OPENSSL"; then | ||
340 | if test "$sc_cv_have_openssl_ssl_h" = "yes" -a "$sc_cv_have_libssl" = "yes"; then | ||
341 | - AC_DEFINE(WITH_OPENSSL) | ||
342 | + AC_DEFINE(WITH_OPENSSL, [1], [With openssl]) | ||
343 | else | ||
344 | AC_MSG_WARN([not all components of OpenSSL found, disabling it]); | ||
345 | fi | ||
346 | @@ -552,7 +552,7 @@ | ||
347 | )] | ||
348 | ) | ||
349 | if test "$sv_cv_have_openssl_fips_h" = "yes"; then | ||
350 | - AC_DEFINE(HAVE_OPENSSL_FIPS_H) | ||
351 | + AC_DEFINE(HAVE_OPENSSL_FIPS_H, [1], [OpenSSL fips.h]) | ||
352 | fi | ||
353 | AC_MSG_NOTICE(checked for openssl/fips.h... $sc_cv_have_openssl_ssl_h) | ||
354 | fi | ||
355 | @@ -583,15 +583,15 @@ | ||
356 | ] | ||
357 | ) | ||
358 | if test "$sc_cv_have_libcrypto" = 'yes'; then | ||
359 | - AC_DEFINE(HAVE_LIBCRYPTO) | ||
360 | + AC_DEFINE(HAVE_LIBCRYPTO, [1], [libcrypto]) | ||
361 | fi | ||
362 | AC_MSG_RESULT($sc_cv_have_libcrypto) | ||
363 | fi | ||
364 | |||
365 | if test -n "$WITH_FIPS"; then | ||
366 | if test "$sc_cv_have_openssl_fips_h" = 'yes' -a "$sc_cv_have_libcrypto" = 'yes'; then | ||
367 | - AC_DEFINE(WITH_FIPS) | ||
368 | - AC_DEFINE(OPENSSL_FIPS) | ||
369 | + AC_DEFINE(WITH_FIPS, [1], [With fips]) | ||
370 | + AC_DEFINE(OPENSSL_FIPS, [1], [openssl fips]) | ||
371 | else | ||
372 | AC_MSG_WARN([not all components of OpenSSL FIPS found, disabling it]); | ||
373 | fi | ||
374 | @@ -612,17 +612,17 @@ | ||
375 | fi | ||
376 | # | ||
377 | if test -n "$WITH_TUN"; then | ||
378 | - AC_DEFINE(WITH_TUN) | ||
379 | + AC_DEFINE(WITH_TUN, [1], [with tun]) | ||
380 | fi | ||
381 | |||
382 | AC_MSG_CHECKING(whether to include system call tracing) | ||
383 | AC_ARG_ENABLE(sycls, [ --disable-sycls disable system call tracing], | ||
384 | [case "$enableval" in | ||
385 | no) SYCLS=""; SSLCLS=""; AC_MSG_RESULT(no);; | ||
386 | - *) AC_DEFINE(WITH_SYCLS) | ||
387 | + *) AC_DEFINE(WITH_SYCLS, [1], [syscls]) | ||
388 | SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes);; | ||
389 | esac], | ||
390 | - [AC_DEFINE(WITH_SYCLS) | ||
391 | + [AC_DEFINE(WITH_SYCLS, [1], [syscls]) | ||
392 | SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes)]) | ||
393 | AC_SUBST(SYCLS) | ||
394 | AC_SUBST(SSLCLS) | ||
395 | @@ -631,31 +631,31 @@ | ||
396 | AC_ARG_ENABLE(filan, [ --disable-filan disable file descriptor analyzer], | ||
397 | [case "$enableval" in | ||
398 | no) FILAN=""; AC_MSG_RESULT(no);; | ||
399 | - *) AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes);; | ||
400 | + *) AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes);; | ||
401 | esac], | ||
402 | - [AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes)]) | ||
403 | + [AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes)]) | ||
404 | AC_SUBST(FILAN) | ||
405 | |||
406 | AC_MSG_CHECKING(whether to include retry support) | ||
407 | AC_ARG_ENABLE(retry, [ --disable-retry disable retry support], | ||
408 | [case "$enableval" in | ||
409 | no) AC_MSG_RESULT(no);; | ||
410 | - *) AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes);; | ||
411 | + *) AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes);; | ||
412 | esac], | ||
413 | - [AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes)]) | ||
414 | + [AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes)]) | ||
415 | |||
416 | AC_MSG_CHECKING(included message level) | ||
417 | AC_ARG_ENABLE(msglevel, [ --enable-msglevel=N set max verbosity to debug,info,notice,warn,error,fatal], | ||
418 | [case "$enableval" in | ||
419 | - debug) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);; | ||
420 | - info) AC_DEFINE(WITH_MSGLEVEL,1) AC_MSG_RESULT(info);; | ||
421 | - notice) AC_DEFINE(WITH_MSGLEVEL,2) AC_MSG_RESULT(notice);; | ||
422 | - warn) AC_DEFINE(WITH_MSGLEVEL,3) AC_MSG_RESULT(warn);; | ||
423 | - error) AC_DEFINE(WITH_MSGLEVEL,4) AC_MSG_RESULT(error);; | ||
424 | - fatal) AC_DEFINE(WITH_MSGLEVEL,5) AC_MSG_RESULT(fatal);; | ||
425 | - *) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);; | ||
426 | + debug) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);; | ||
427 | + info) AC_DEFINE(WITH_MSGLEVEL,1, [msglevel]) AC_MSG_RESULT(info);; | ||
428 | + notice) AC_DEFINE(WITH_MSGLEVEL,2, [msglevel]) AC_MSG_RESULT(notice);; | ||
429 | + warn) AC_DEFINE(WITH_MSGLEVEL,3, [msglevel]) AC_MSG_RESULT(warn);; | ||
430 | + error) AC_DEFINE(WITH_MSGLEVEL,4, [msglevel]) AC_MSG_RESULT(error);; | ||
431 | + fatal) AC_DEFINE(WITH_MSGLEVEL,5, [msglevel]) AC_MSG_RESULT(fatal);; | ||
432 | + *) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);; | ||
433 | esac], | ||
434 | - [AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug)]) | ||
435 | + [AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug)]) | ||
436 | |||
437 | #AC_SUBST(V_INCL) | ||
438 | |||
439 | @@ -672,7 +672,7 @@ | ||
440 | AC_HEADER_TIME | ||
441 | |||
442 | dnl Check for extra realtime library (for Solaris) | ||
443 | -AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP)])) | ||
444 | +AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep]), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep])])) | ||
445 | #AC_CHECK_FUNC(nanosleep, , AC_CHECK_LIB(rt, nanosleep)) | ||
446 | |||
447 | dnl Checks for library functions. | ||
448 | @@ -694,7 +694,7 @@ | ||
449 | [sc_cv_type_longlong=yes], | ||
450 | [sc_cv_type_longlong=no])]) | ||
451 | if test $sc_cv_type_longlong = yes; then | ||
452 | - AC_DEFINE(HAVE_TYPE_LONGLONG) | ||
453 | + AC_DEFINE(HAVE_TYPE_LONGLONG, [1], [have type long long]) | ||
454 | fi | ||
455 | AC_MSG_RESULT($sc_cv_type_longlong) | ||
456 | |||
457 | @@ -710,7 +710,7 @@ | ||
458 | [sc_cv_type_socklen=yes], | ||
459 | [sc_cv_type_socklen=no])]) | ||
460 | if test $sc_cv_type_socklen = yes; then | ||
461 | - AC_DEFINE(HAVE_TYPE_SOCKLEN) | ||
462 | + AC_DEFINE(HAVE_TYPE_SOCKLEN, [1], [Has Socklen]) | ||
463 | fi | ||
464 | AC_MSG_RESULT($sc_cv_type_socklen) | ||
465 | |||
466 | @@ -720,7 +720,7 @@ | ||
467 | [sc_cv_type_stat64=yes], | ||
468 | [sc_cv_type_stat64=no])]) | ||
469 | if test $sc_cv_type_stat64 = yes; then | ||
470 | - AC_DEFINE(HAVE_TYPE_STAT64) | ||
471 | + AC_DEFINE(HAVE_TYPE_STAT64, [1], [Has stat64]) | ||
472 | fi | ||
473 | AC_MSG_RESULT($sc_cv_type_stat64) | ||
474 | |||
475 | @@ -730,7 +730,7 @@ | ||
476 | [sc_cv_type_off64=yes], | ||
477 | [sc_cv_type_off64=no])]) | ||
478 | if test $sc_cv_type_off64 = yes; then | ||
479 | - AC_DEFINE(HAVE_TYPE_OFF64) | ||
480 | + AC_DEFINE(HAVE_TYPE_OFF64, [1], [have off64]) | ||
481 | fi | ||
482 | AC_MSG_RESULT($sc_cv_type_off64) | ||
483 | |||
484 | @@ -740,7 +740,7 @@ | ||
485 | [sc_cv_type_sighandler=yes], | ||
486 | [sc_cv_type_sighandler=no])]) | ||
487 | if test $sc_cv_type_sighandler = yes; then | ||
488 | - AC_DEFINE(HAVE_TYPE_SIGHANDLER) | ||
489 | + AC_DEFINE(HAVE_TYPE_SIGHANDLER, [1], [have type sighandler]) | ||
490 | fi | ||
491 | AC_MSG_RESULT($sc_cv_type_socklen) | ||
492 | |||
493 | @@ -758,7 +758,7 @@ | ||
494 | [sc_cv_type_uint8=yes], | ||
495 | [sc_cv_type_uint8=no])]) | ||
496 | if test $sc_cv_type_uint8 = yes; then | ||
497 | - AC_DEFINE(HAVE_TYPE_UINT8) | ||
498 | + AC_DEFINE(HAVE_TYPE_UINT8, [1], [have uint8]) | ||
499 | fi | ||
500 | AC_MSG_RESULT($sc_cv_type_uint8) | ||
501 | |||
502 | @@ -776,7 +776,7 @@ | ||
503 | [sc_cv_type_uint16=yes], | ||
504 | [sc_cv_type_uint16=no])]) | ||
505 | if test $sc_cv_type_uint16 = yes; then | ||
506 | - AC_DEFINE(HAVE_TYPE_UINT16) | ||
507 | + AC_DEFINE(HAVE_TYPE_UINT16, [1], [have uint16t]) | ||
508 | fi | ||
509 | AC_MSG_RESULT($sc_cv_type_uint16) | ||
510 | |||
511 | @@ -794,7 +794,7 @@ | ||
512 | [sc_cv_type_uint32=yes], | ||
513 | [sc_cv_type_uint32=no])]) | ||
514 | if test $sc_cv_type_uint32 = yes; then | ||
515 | - AC_DEFINE(HAVE_TYPE_UINT32) | ||
516 | + AC_DEFINE(HAVE_TYPE_UINT32, [1], [have uint32]) | ||
517 | fi | ||
518 | AC_MSG_RESULT($sc_cv_type_uint32) | ||
519 | |||
520 | @@ -812,7 +812,7 @@ | ||
521 | [sc_cv_type_uint64=yes], | ||
522 | [sc_cv_type_uint64=no])]) | ||
523 | if test $sc_cv_type_uint64 = yes; then | ||
524 | - AC_DEFINE(HAVE_TYPE_UINT64) | ||
525 | + AC_DEFINE(HAVE_TYPE_UINT64, [1], [have uint64] ) | ||
526 | fi | ||
527 | AC_MSG_RESULT($sc_cv_type_uint64) | ||
528 | |||
529 | @@ -834,7 +834,7 @@ | ||
530 | #include <sys/select.h> | ||
531 | #endif], | ||
532 | [fd_set s; s.fds_bits[0]=0;], | ||
533 | -[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS)], | ||
534 | +[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS, [1], [have fds bits])], | ||
535 | [AC_MSG_RESULT(no);]) | ||
536 | |||
537 | AC_MSG_CHECKING(for sa_family_t) | ||
538 | @@ -844,7 +844,7 @@ | ||
539 | [sc_cv_type_sa_family_t=yes], | ||
540 | [sc_cv_type_sa_family_t=no])]) | ||
541 | if test $sc_cv_type_sa_family_t = yes; then | ||
542 | - AC_DEFINE(HAVE_TYPE_SA_FAMILY_T) | ||
543 | + AC_DEFINE(HAVE_TYPE_SA_FAMILY_T, [1], [have sa family_t type]) | ||
544 | fi | ||
545 | AC_MSG_RESULT($sc_cv_type_sa_family_t) | ||
546 | |||
547 | @@ -854,7 +854,7 @@ | ||
548 | [sc_cv_struct_sigaction_sa_sigaction=yes], | ||
549 | [sc_cv_struct_sigaction_sa_sigaction=no])]) | ||
550 | if test $sc_cv_struct_sigaction_sa_sigaction = yes; then | ||
551 | - AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION) | ||
552 | + AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION, [1], [sigaction]) | ||
553 | fi | ||
554 | AC_MSG_RESULT($sc_cv_struct_sigaction_sa_sigaction) | ||
555 | |||
556 | @@ -862,11 +862,11 @@ | ||
557 | AC_MSG_CHECKING(for termios.c_ispeed) | ||
558 | AC_CACHE_VAL(sc_cv_termios_ispeed, | ||
559 | [AC_TRY_COMPILE([#include <termios.h>], | ||
560 | -[struct termios t; t.c_ispeed=0;], | ||
561 | +[struct termios t; t.c_ispeed=ISPEED_OFFSET; t.c_ospeed=OSPEED_OFFSET;], | ||
562 | [sc_cv_termios_ispeed=yes], | ||
563 | [sc_cv_termios_ispeed=no])]) | ||
564 | if test $sc_cv_termios_ispeed = yes; then | ||
565 | - AC_DEFINE(HAVE_TERMIOS_ISPEED) | ||
566 | + AC_DEFINE(HAVE_TERMIOS_ISPEED, [1], [have ispeed]) | ||
567 | fi | ||
568 | AC_MSG_RESULT($sc_cv_termios_ispeed) | ||
569 | |||
570 | @@ -897,7 +897,7 @@ | ||
571 | LIBS="$LIBS1" | ||
572 | AC_MSG_RESULT($ac_cv_ispeed_offset) | ||
573 | if test $ac_cv_ispeed_offset -ge 0; then | ||
574 | - AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset) | ||
575 | + AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset, [have ispeed]) | ||
576 | fi | ||
577 | fi | ||
578 | |||
579 | @@ -916,7 +916,7 @@ | ||
580 | )] | ||
581 | )]) | ||
582 | if test $ac_cv_svid3 = yes; then | ||
583 | - AC_DEFINE(_SVID3) | ||
584 | + AC_DEFINE(_SVID3, [1], [svid3]) | ||
585 | fi | ||
586 | AC_MSG_RESULT($ac_cv_svid3) | ||
587 | |||
588 | @@ -931,7 +931,7 @@ | ||
589 | [sc_cv_struct_timespec=yes], | ||
590 | [sc_cv_struct_timespec=no])]) | ||
591 | if test $sc_cv_struct_timespec = yes; then | ||
592 | - AC_DEFINE(HAVE_STRUCT_TIMESPEC) | ||
593 | + AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [struct timespec]) | ||
594 | fi | ||
595 | AC_MSG_RESULT($sc_cv_struct_timespec) | ||
596 | |||
597 | @@ -944,7 +944,7 @@ | ||
598 | [sc_cv_struct_linger=yes], | ||
599 | [sc_cv_struct_linger=no])]) | ||
600 | if test $sc_cv_struct_linger = yes; then | ||
601 | - AC_DEFINE(HAVE_STRUCT_LINGER) | ||
602 | + AC_DEFINE(HAVE_STRUCT_LINGER, [1], [struct linger]) | ||
603 | fi | ||
604 | AC_MSG_RESULT($sc_cv_struct_linger) | ||
605 | |||
606 | @@ -958,7 +958,7 @@ | ||
607 | [sc_cv_struct_ip_mreq=yes], | ||
608 | [sc_cv_struct_ip_mreq=no])]) | ||
609 | if test $sc_cv_struct_ip_mreq = yes; then | ||
610 | - AC_DEFINE(HAVE_STRUCT_IP_MREQ) | ||
611 | + AC_DEFINE(HAVE_STRUCT_IP_MREQ, [1], [have struct ip mreq]) | ||
612 | fi | ||
613 | AC_MSG_RESULT($sc_cv_struct_ip_mreq) | ||
614 | |||
615 | @@ -971,7 +971,7 @@ | ||
616 | [sc_cv_struct_ip_mreqn=yes], | ||
617 | [sc_cv_struct_ip_mreqn=no])]) | ||
618 | if test $sc_cv_struct_ip_mreqn = yes; then | ||
619 | - AC_DEFINE(HAVE_STRUCT_IP_MREQN) | ||
620 | + AC_DEFINE(HAVE_STRUCT_IP_MREQN, [1], [have struct ip mreqn]) | ||
621 | fi | ||
622 | AC_MSG_RESULT($sc_cv_struct_ip_mreqn) | ||
623 | |||
624 | @@ -984,7 +984,7 @@ | ||
625 | [sc_cv_struct_ipv6_mreq=yes], | ||
626 | [sc_cv_struct_ipv6_mreq=no])]) | ||
627 | if test $sc_cv_struct_ipv6_mreq = yes; then | ||
628 | - AC_DEFINE(HAVE_STRUCT_IPV6_MREQ) | ||
629 | + AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, [1], [have struct ipv5 mreq]) | ||
630 | fi | ||
631 | AC_MSG_RESULT($sc_cv_struct_ipv6_mreq) | ||
632 | |||
633 | @@ -998,7 +998,7 @@ | ||
634 | [sc_cv_struct_ifreq=yes], | ||
635 | [sc_cv_struct_ifreq=no])]) | ||
636 | if test $sc_cv_struct_ifreq = yes; then | ||
637 | - AC_DEFINE(HAVE_STRUCT_IFREQ) | ||
638 | + AC_DEFINE(HAVE_STRUCT_IFREQ, [1], [have struct ifreq]) | ||
639 | fi | ||
640 | AC_MSG_RESULT($sc_cv_struct_ifreq) | ||
641 | |||
642 | @@ -1013,7 +1013,7 @@ | ||
643 | [sc_cv_struct_ifreq_ifr_index=yes], | ||
644 | [sc_cv_struct_ifreq_ifr_index=no])]) | ||
645 | if test $sc_cv_struct_ifreq_ifr_index = yes; then | ||
646 | - AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX) | ||
647 | + AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX, [1], [have struct ifreq ifr]) | ||
648 | fi | ||
649 | AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_index) | ||
650 | |||
651 | @@ -1028,7 +1028,7 @@ | ||
652 | [sc_cv_struct_ifreq_ifr_ifindex=yes], | ||
653 | [sc_cv_struct_ifreq_ifr_ifindex=no])]) | ||
654 | if test $sc_cv_struct_ifreq_ifr_ifindex = yes; then | ||
655 | - AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX) | ||
656 | + AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX, [1], [have struct ifreq ifindex]) | ||
657 | fi | ||
658 | AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_ifindex) | ||
659 | |||
660 | @@ -1043,7 +1043,7 @@ | ||
661 | [sc_cv_struct_sockaddr_salen=yes], | ||
662 | [sc_cv_struct_sockaddr_salen=no])]) | ||
663 | if test $sc_cv_struct_sockaddr_salen = yes; then | ||
664 | - AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN) | ||
665 | + AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN, [1], [sockaddr salen]) | ||
666 | fi | ||
667 | AC_MSG_RESULT($sc_cv_struct_sockaddr_salen) | ||
668 | |||
669 | @@ -1054,31 +1054,31 @@ | ||
670 | #include <netinet/in.h>], | ||
671 | [struct sockaddr_in6 sa6;sa6.sin6_addr.s6_addr[0]=0;], | ||
672 | [AC_MSG_RESULT(s6_addr); | ||
673 | - AC_DEFINE(HAVE_IP6_SOCKADDR, 0)], | ||
674 | + AC_DEFINE(HAVE_IP6_SOCKADDR, 0, [ip6 sockaddr])], | ||
675 | [AC_TRY_COMPILE([#include <sys/types.h> | ||
676 | #include <netinet/in.h>], | ||
677 | [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr.u6_addr16[0]=0;], | ||
678 | [AC_MSG_RESULT(u6_addr.u6_addr16); | ||
679 | - AC_DEFINE(HAVE_IP6_SOCKADDR, 1)], | ||
680 | + AC_DEFINE(HAVE_IP6_SOCKADDR, 1, [ip6 sockaddr])], | ||
681 | [AC_TRY_COMPILE([#include <sys/types.h> | ||
682 | #include <netinet/in.h>], | ||
683 | [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr16[0]=0;], | ||
684 | - [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2)], | ||
685 | + [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2, [ip6 sockaddr])], | ||
686 | [AC_TRY_COMPILE([#include <sys/types.h> | ||
687 | #include <netinet/in.h>], | ||
688 | [struct sockaddr_in6 sa6;sa6.sin6_addr.in6_u.u6_addr16[0]=0;], | ||
689 | [AC_MSG_RESULT(in6_u.u6_addr16); | ||
690 | - AC_DEFINE(HAVE_IP6_SOCKADDR, 3)], | ||
691 | + AC_DEFINE(HAVE_IP6_SOCKADDR, 3, [ip6 sockaddr])], | ||
692 | [AC_TRY_COMPILE([#include <sys/types.h> | ||
693 | #include <netinet/in.h>], | ||
694 | [struct sockaddr_in6 sa6;sa6.sin6_addr._S6_un._S6_u32[0]=0;], | ||
695 | [AC_MSG_RESULT(_S6_un._S6_u32); | ||
696 | - AC_DEFINE(HAVE_IP6_SOCKADDR, 4)], | ||
697 | + AC_DEFINE(HAVE_IP6_SOCKADDR, 4, [ip6 sockaddr])], | ||
698 | [AC_TRY_COMPILE([#include <sys/types.h> | ||
699 | #include <netinet/in.h>], | ||
700 | [struct sockaddr_in6 sa6;sa6.sin6_addr.__u6_addr.__u6_addr32[0]=0;], | ||
701 | [AC_MSG_RESULT(__u6_addr.__u6_addr32); | ||
702 | - AC_DEFINE(HAVE_IP6_SOCKADDR, 5)], | ||
703 | + AC_DEFINE(HAVE_IP6_SOCKADDR, 5, [ip6 sockaddr])], | ||
704 | |||
705 | [AC_MSG_RESULT([none or unknown])] | ||
706 | )])])])])]) | ||
707 | @@ -1090,7 +1090,7 @@ | ||
708 | [sc_cv_struct_iovec=yes], | ||
709 | [sc_cv_struct_iovec=no])]) | ||
710 | if test $sc_cv_struct_iovec = yes; then | ||
711 | - AC_DEFINE(HAVE_STRUCT_IOVEC) | ||
712 | + AC_DEFINE(HAVE_STRUCT_IOVEC, [1], [have struct iovec]) | ||
713 | fi | ||
714 | AC_MSG_RESULT($sc_cv_struct_iovec) | ||
715 | |||
716 | @@ -1103,7 +1103,7 @@ | ||
717 | [sc_cv_struct_msghdr_msgcontrol=yes], | ||
718 | [sc_cv_struct_msghdr_msgcontrol=no])]) | ||
719 | if test $sc_cv_struct_msghdr_msgcontrol = yes; then | ||
720 | - AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL) | ||
721 | + AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL, [1], [have struct msgcontrol]) | ||
722 | fi | ||
723 | AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrol) | ||
724 | |||
725 | @@ -1116,7 +1116,7 @@ | ||
726 | [sc_cv_struct_msghdr_msgcontrollen=yes], | ||
727 | [sc_cv_struct_msghdr_msgcontrollen=no])]) | ||
728 | if test $sc_cv_struct_msghdr_msgcontrollen = yes; then | ||
729 | - AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN) | ||
730 | + AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN, [1], [have struct msghdr msgcontrollen]) | ||
731 | fi | ||
732 | AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrollen) | ||
733 | |||
734 | @@ -1129,7 +1129,7 @@ | ||
735 | [sc_cv_struct_msghdr_msgflags=yes], | ||
736 | [sc_cv_struct_msghdr_msgflags=no])]) | ||
737 | if test $sc_cv_struct_msghdr_msgflags = yes; then | ||
738 | - AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS) | ||
739 | + AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS, [1], [msgflags]) | ||
740 | fi | ||
741 | AC_MSG_RESULT($sc_cv_struct_msghdr_msgflags) | ||
742 | |||
743 | @@ -1142,7 +1142,7 @@ | ||
744 | [sc_cv_struct_cmsghdr=yes], | ||
745 | [sc_cv_struct_cmsghdr=no])]) | ||
746 | if test $sc_cv_struct_cmsghdr = yes; then | ||
747 | - AC_DEFINE(HAVE_STRUCT_CMSGHDR) | ||
748 | + AC_DEFINE(HAVE_STRUCT_CMSGHDR, [1], [have cmshdr]) | ||
749 | fi | ||
750 | AC_MSG_RESULT($sc_cv_struct_cmsghdr) | ||
751 | |||
752 | @@ -1155,7 +1155,7 @@ | ||
753 | [sc_cv_struct_in_pktinfo=yes], | ||
754 | [sc_cv_struct_in_pktinfo=no])]) | ||
755 | if test $sc_cv_struct_in_pktinfo = yes; then | ||
756 | - AC_DEFINE(HAVE_STRUCT_IN_PKTINFO) | ||
757 | + AC_DEFINE(HAVE_STRUCT_IN_PKTINFO, [1], [pktinfo]) | ||
758 | fi | ||
759 | AC_MSG_RESULT($sc_cv_struct_in_pktinfo) | ||
760 | |||
761 | @@ -1170,7 +1170,7 @@ | ||
762 | [sc_cv_struct_ip_ip_hl=yes], | ||
763 | [sc_cv_struct_ip_ip_hl=no])]) | ||
764 | if test $sc_cv_struct_ip_ip_hl = yes; then | ||
765 | - AC_DEFINE(HAVE_STRUCT_IP_IP_HL) | ||
766 | + AC_DEFINE(HAVE_STRUCT_IP_IP_HL, [1], [foo]) | ||
767 | fi | ||
768 | AC_MSG_RESULT($sc_cv_struct_ip_ip_hl) | ||
769 | |||
770 | @@ -1178,19 +1178,19 @@ | ||
771 | dnl Library function checks | ||
772 | |||
773 | dnl Check sigaction() | ||
774 | -AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION)) | ||
775 | +AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION, [1], [foo])) | ||
776 | |||
777 | dnl Check for 64bit versions of system calls | ||
778 | -AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64)) | ||
779 | -AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64)) | ||
780 | -AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64)) | ||
781 | -AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64)) | ||
782 | -AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64)) | ||
783 | -AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64)) | ||
784 | - | ||
785 | -AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) | ||
786 | -AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR)) | ||
787 | -AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP)) | ||
788 | +AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64, [1], [foo])) | ||
789 | +AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64, [1], [foo])) | ||
790 | +AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64, [1], [foo])) | ||
791 | +AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64, [1], [foo])) | ||
792 | +AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64, [1], [foo])) | ||
793 | +AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64, [1], [foo])) | ||
794 | + | ||
795 | +AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL, [1], [foo])) | ||
796 | +AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR, [1], [foo])) | ||
797 | +AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP, [1], [foo])) | ||
798 | |||
799 | #if test "$ac_cv_func_hstrerror" = "yes"; then | ||
800 | # AC_MSG_CHECKING(if _XOPEN_SOURCE_EXTENDED is helpful) | ||
801 | @@ -1213,25 +1213,26 @@ | ||
802 | |||
803 | dnl Search for openpty() | ||
804 | # MacOS | ||
805 | -AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY)) | ||
806 | +AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY, [1], [foo])) | ||
807 | # AIX | ||
808 | AC_CHECK_LIB(bsd, openpty, | ||
809 | - [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY)]) | ||
810 | + [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])]) | ||
811 | # Linux 2.4 | ||
812 | AC_CHECK_LIB(util, openpty, | ||
813 | - [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY)]) | ||
814 | + [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])]) | ||
815 | + | ||
816 | |||
817 | dnl Search for flock() | ||
818 | # with Linux it's in libc, with AIX in libbsd | ||
819 | -AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK), | ||
820 | +AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK, [1], [have flock]), | ||
821 | AC_CHECK_LIB(bsd, flock, [LIBS="-lbsd $LIBS"])) | ||
822 | |||
823 | dnl Search for setenv() | ||
824 | -AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV), | ||
825 | +AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, [1], [have setenv]), | ||
826 | AC_CHECK_LIB(isode, setenv, [LIBS="-lisode $LIBS"])) | ||
827 | |||
828 | dnl Search for unsetenv() | ||
829 | -AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV)) | ||
830 | +AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, [1], [have unsetenv])) | ||
831 | |||
832 | |||
833 | dnl Run time checks | ||
834 | @@ -1250,7 +1251,7 @@ | ||
835 | [ac_cv_have_z_modifier=no], | ||
836 | [ac_cv_have_z_modifier=no])]) | ||
837 | if test $ac_cv_have_z_modifier = yes; then | ||
838 | - AC_DEFINE(HAVE_FORMAT_Z) | ||
839 | + AC_DEFINE(HAVE_FORMAT_Z, [1], [have format z]) | ||
840 | fi | ||
841 | AC_MSG_RESULT($ac_cv_have_z_modifier) | ||
842 | |||
843 | @@ -1289,7 +1290,8 @@ | ||
844 | [AC_MSG_RESULT(please determine $1_SHIFT manually)] | ||
845 | ) | ||
846 | LIBS="$LIBS1"]) | ||
847 | -AC_DEFINE_UNQUOTED($1_SHIFT, ${$2}) | ||
848 | +SHIFT_NAME="$1"_SHIFT | ||
849 | +AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo]) | ||
850 | ]) | ||
851 | |||
852 | AC_SHIFT_OFFSET(CRDLY, sc_cv_sys_crdly_shift) | ||
853 | @@ -1326,7 +1328,7 @@ | ||
854 | [$4="0 /* unknown, taking default */" | ||
855 | ]) ]) ]) ]) ]) ]) ]) ]) | ||
856 | CFLAGS="$CFLAGS1" ]) | ||
857 | -AC_DEFINE_UNQUOTED($3, ${$4}) | ||
858 | +AC_DEFINE_UNQUOTED($3, ${$4}, [foo]) | ||
859 | ]) | ||
860 | |||
861 | dnl find what physical type (basic C type) describes the given struct or union | ||
862 | @@ -1358,7 +1360,7 @@ | ||
863 | [$5="0 /* unknown, taking default */" | ||
864 | ]) ]) ]) ]) ]) ]) ]) ]) | ||
865 | CFLAGS="$CFLAGS1" ]) | ||
866 | -AC_DEFINE_UNQUOTED($4, ${$5}) | ||
867 | +AC_DEFINE_UNQUOTED($4, ${$5}, [foo]) | ||
868 | ]) | ||
869 | |||
870 | AC_BASIC_TYPE([#include <stdlib.h>], size_t, HAVE_BASIC_SIZE_T, sc_cv_type_sizet_basic) | ||
871 | @@ -1416,13 +1418,13 @@ | ||
872 | |||
873 | AC_MSG_CHECKING(for /dev/ptmx) | ||
874 | if test -c /dev/ptmx; then | ||
875 | - AC_DEFINE(HAVE_DEV_PTMX, 1) | ||
876 | + AC_DEFINE(HAVE_DEV_PTMX, 1, [ptmx]) | ||
877 | AC_MSG_RESULT(yes) | ||
878 | else | ||
879 | AC_MSG_RESULT(no) | ||
880 | AC_MSG_CHECKING(for /dev/ptc) | ||
881 | if test -c /dev/ptc; then | ||
882 | - AC_DEFINE(HAVE_DEV_PTC) | ||
883 | + AC_DEFINE(HAVE_DEV_PTC, 1, [ptc]) | ||
884 | AC_MSG_RESULT(yes) | ||
885 | else | ||
886 | AC_MSG_RESULT(no) | ||
887 | @@ -1431,7 +1433,7 @@ | ||
888 | |||
889 | AC_MSG_CHECKING(for /proc) | ||
890 | if test -d /proc; then | ||
891 | - AC_DEFINE(HAVE_PROC_DIR, 1) | ||
892 | + AC_DEFINE(HAVE_PROC_DIR, 1, [procdir]) | ||
893 | AC_MSG_RESULT(yes) | ||
894 | else | ||
895 | AC_MSG_RESULT(no) | ||
896 | @@ -1439,7 +1441,7 @@ | ||
897 | |||
898 | AC_MSG_CHECKING(for /proc/*/fd) | ||
899 | if test -d /proc/$$/fd; then | ||
900 | - AC_DEFINE(HAVE_PROC_DIR_FD, 1) | ||
901 | + AC_DEFINE(HAVE_PROC_DIR_FD, 1, [procdir fd]) | ||
902 | AC_MSG_RESULT(yes) | ||
903 | else | ||
904 | AC_MSG_RESULT(no) | ||
905 | @@ -1479,7 +1481,7 @@ | ||
906 | done]) | ||
907 | ]) | ||
908 | if test "$sc_cv_have_tcpd_h" = "yes"; then | ||
909 | - AC_DEFINE(HAVE_TCPD_H) | ||
910 | + AC_DEFINE(HAVE_TCPD_H, [1], [have tcpd]) | ||
911 | fi | ||
912 | AC_MSG_NOTICE(checked for tcpd.h... $sc_cv_have_tcpd_h) | ||
913 | fi # end checking for tcpd.h | ||
914 | @@ -1512,14 +1514,14 @@ | ||
915 | ] | ||
916 | ) | ||
917 | if test "$sc_cv_have_libwrap" = 'yes'; then | ||
918 | - AC_DEFINE(HAVE_LIBWRAP) | ||
919 | + AC_DEFINE(HAVE_LIBWRAP, [1], [libwrap]) | ||
920 | fi | ||
921 | AC_MSG_RESULT($sc_cv_have_libwrap) | ||
922 | fi | ||
923 | # | ||
924 | if test -n "$WITH_LIBWRAP"; then | ||
925 | if test "$sc_cv_have_tcpd_h" = "yes" -a "$sc_cv_have_libwrap" = "yes"; then | ||
926 | - AC_DEFINE(WITH_LIBWRAP) | ||
927 | + AC_DEFINE(WITH_LIBWRAP, [1], [libwrap]) | ||
928 | else | ||
929 | AC_MSG_WARN([not all components of tcp wrappers found, disabling it]); | ||
930 | fi | ||
931 | @@ -1534,7 +1536,7 @@ | ||
932 | [sc_cv_have_hosts_allow_table=yes], | ||
933 | [sc_cv_have_hosts_allow_table=no])]) | ||
934 | if test $sc_cv_have_hosts_allow_table = yes; then | ||
935 | - AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE) | ||
936 | + AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE, [1], [hosts allow table]) | ||
937 | fi | ||
938 | AC_MSG_RESULT($sc_cv_have_hosts_allow_table) | ||
939 | fi # test -n "$WITH_LIBWRAP" | ||