]>
Commit | Line | Data |
---|---|---|
c40034df AM |
1 | diff -urN wget-1.5.3.orig/configure wget-1.5.3/configure |
2 | --- wget-1.5.3.orig/configure Sat May 22 13:25:03 1999 | |
3 | +++ wget-1.5.3/configure Sat May 22 13:31:33 1999 | |
4 | @@ -1,7 +1,7 @@ | |
5 | #! /bin/sh | |
6 | ||
7 | # Guess values for system-dependent variables and create Makefiles. | |
8 | -# Generated automatically using autoconf version 2.12 | |
9 | +# Generated automatically using autoconf version 2.13 | |
10 | # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. | |
11 | # | |
12 | # This configure script is free software; the Free Software Foundation | |
13 | @@ -12,6 +12,9 @@ | |
14 | ac_default_prefix=/usr/local | |
15 | # Any additions from configure.in: | |
16 | ac_help="$ac_help | |
17 | + --enable-ipv6 Enable ipv6 (with ipv4) support | |
18 | + --disable-ipv6 Disable ipv6 support" | |
19 | +ac_help="$ac_help | |
20 | --with-socks use the socks library" | |
21 | ac_help="$ac_help | |
22 | --disable-opie disable support for opie or s/key FTP login" | |
23 | @@ -59,6 +62,7 @@ | |
24 | # Initialize some other variables. | |
25 | subdirs= | |
26 | MFLAGS= MAKEFLAGS= | |
27 | +SHELL=${CONFIG_SHELL-/bin/sh} | |
28 | # Maximum number of lines to put in a shell here document. | |
29 | ac_max_here_lines=12 | |
30 | ||
31 | @@ -342,7 +346,7 @@ | |
32 | verbose=yes ;; | |
33 | ||
34 | -version | --version | --versio | --versi | --vers) | |
35 | - echo "configure generated by autoconf version 2.12" | |
36 | + echo "configure generated by autoconf version 2.13" | |
37 | exit 0 ;; | |
38 | ||
39 | -with-* | --with-*) | |
40 | @@ -512,9 +516,11 @@ | |
41 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
42 | ac_cpp='$CPP $CPPFLAGS' | |
43 | ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | |
44 | -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | |
45 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | |
46 | cross_compiling=$ac_cv_prog_cc_cross | |
47 | ||
48 | +ac_exeext= | |
49 | +ac_objext=o | |
50 | if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then | |
51 | # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. | |
52 | if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then | |
53 | @@ -537,6 +543,334 @@ | |
54 | PACKAGE=wget | |
55 | ||
56 | ||
57 | +# Extract the first word of "gcc", so it can be a program name with args. | |
58 | +set dummy gcc; ac_word=$2 | |
59 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
60 | +echo "configure:550: checking for $ac_word" >&5 | |
61 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
62 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
63 | +else | |
64 | + if test -n "$CC"; then | |
65 | + ac_cv_prog_CC="$CC" # Let the user override the test. | |
66 | +else | |
67 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
68 | + ac_dummy="$PATH" | |
69 | + for ac_dir in $ac_dummy; do | |
70 | + test -z "$ac_dir" && ac_dir=. | |
71 | + if test -f $ac_dir/$ac_word; then | |
72 | + ac_cv_prog_CC="gcc" | |
73 | + break | |
74 | + fi | |
75 | + done | |
76 | + IFS="$ac_save_ifs" | |
77 | +fi | |
78 | +fi | |
79 | +CC="$ac_cv_prog_CC" | |
80 | +if test -n "$CC"; then | |
81 | + echo "$ac_t""$CC" 1>&6 | |
82 | +else | |
83 | + echo "$ac_t""no" 1>&6 | |
84 | +fi | |
85 | + | |
86 | +if test -z "$CC"; then | |
87 | + # Extract the first word of "cc", so it can be a program name with args. | |
88 | +set dummy cc; ac_word=$2 | |
89 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
90 | +echo "configure:580: checking for $ac_word" >&5 | |
91 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
92 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
93 | +else | |
94 | + if test -n "$CC"; then | |
95 | + ac_cv_prog_CC="$CC" # Let the user override the test. | |
96 | +else | |
97 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
98 | + ac_prog_rejected=no | |
99 | + ac_dummy="$PATH" | |
100 | + for ac_dir in $ac_dummy; do | |
101 | + test -z "$ac_dir" && ac_dir=. | |
102 | + if test -f $ac_dir/$ac_word; then | |
103 | + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then | |
104 | + ac_prog_rejected=yes | |
105 | + continue | |
106 | + fi | |
107 | + ac_cv_prog_CC="cc" | |
108 | + break | |
109 | + fi | |
110 | + done | |
111 | + IFS="$ac_save_ifs" | |
112 | +if test $ac_prog_rejected = yes; then | |
113 | + # We found a bogon in the path, so make sure we never use it. | |
114 | + set dummy $ac_cv_prog_CC | |
115 | + shift | |
116 | + if test $# -gt 0; then | |
117 | + # We chose a different compiler from the bogus one. | |
118 | + # However, it has the same basename, so the bogon will be chosen | |
119 | + # first if we set CC to just the basename; use the full file name. | |
120 | + shift | |
121 | + set dummy "$ac_dir/$ac_word" "$@" | |
122 | + shift | |
123 | + ac_cv_prog_CC="$@" | |
124 | + fi | |
125 | +fi | |
126 | +fi | |
127 | +fi | |
128 | +CC="$ac_cv_prog_CC" | |
129 | +if test -n "$CC"; then | |
130 | + echo "$ac_t""$CC" 1>&6 | |
131 | +else | |
132 | + echo "$ac_t""no" 1>&6 | |
133 | +fi | |
134 | + | |
135 | + if test -z "$CC"; then | |
136 | + case "`uname -s`" in | |
137 | + *win32* | *WIN32*) | |
138 | + # Extract the first word of "cl", so it can be a program name with args. | |
139 | +set dummy cl; ac_word=$2 | |
140 | +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
141 | +echo "configure:631: checking for $ac_word" >&5 | |
142 | +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
143 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
144 | +else | |
145 | + if test -n "$CC"; then | |
146 | + ac_cv_prog_CC="$CC" # Let the user override the test. | |
147 | +else | |
148 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
149 | + ac_dummy="$PATH" | |
150 | + for ac_dir in $ac_dummy; do | |
151 | + test -z "$ac_dir" && ac_dir=. | |
152 | + if test -f $ac_dir/$ac_word; then | |
153 | + ac_cv_prog_CC="cl" | |
154 | + break | |
155 | + fi | |
156 | + done | |
157 | + IFS="$ac_save_ifs" | |
158 | +fi | |
159 | +fi | |
160 | +CC="$ac_cv_prog_CC" | |
161 | +if test -n "$CC"; then | |
162 | + echo "$ac_t""$CC" 1>&6 | |
163 | +else | |
164 | + echo "$ac_t""no" 1>&6 | |
165 | +fi | |
166 | + ;; | |
167 | + esac | |
168 | + fi | |
169 | + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } | |
170 | +fi | |
171 | + | |
172 | +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
173 | +echo "configure:663: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
174 | + | |
175 | +ac_ext=c | |
176 | +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
177 | +ac_cpp='$CPP $CPPFLAGS' | |
178 | +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | |
179 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | |
180 | +cross_compiling=$ac_cv_prog_cc_cross | |
181 | + | |
182 | +cat > conftest.$ac_ext << EOF | |
183 | + | |
184 | +#line 674 "configure" | |
185 | +#include "confdefs.h" | |
186 | + | |
187 | +main(){return(0);} | |
188 | +EOF | |
189 | +if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
190 | + ac_cv_prog_cc_works=yes | |
191 | + # If we can't run a trivial program, we are probably using a cross compiler. | |
192 | + if (./conftest; exit) 2>/dev/null; then | |
193 | + ac_cv_prog_cc_cross=no | |
194 | + else | |
195 | + ac_cv_prog_cc_cross=yes | |
196 | + fi | |
197 | +else | |
198 | + echo "configure: failed program was:" >&5 | |
199 | + cat conftest.$ac_ext >&5 | |
200 | + ac_cv_prog_cc_works=no | |
201 | +fi | |
202 | +rm -fr conftest* | |
203 | +ac_ext=c | |
204 | +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
205 | +ac_cpp='$CPP $CPPFLAGS' | |
206 | +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | |
207 | +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | |
208 | +cross_compiling=$ac_cv_prog_cc_cross | |
209 | + | |
210 | +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 | |
211 | +if test $ac_cv_prog_cc_works = no; then | |
212 | + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | |
213 | +fi | |
214 | +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
215 | +echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
216 | +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
217 | +cross_compiling=$ac_cv_prog_cc_cross | |
218 | + | |
219 | +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
220 | +echo "configure:710: checking whether we are using GNU C" >&5 | |
221 | +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
222 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
223 | +else | |
224 | + cat > conftest.c <<EOF | |
225 | +#ifdef __GNUC__ | |
226 | + yes; | |
227 | +#endif | |
228 | +EOF | |
229 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
230 | + ac_cv_prog_gcc=yes | |
231 | +else | |
232 | + ac_cv_prog_gcc=no | |
233 | +fi | |
234 | +fi | |
235 | + | |
236 | +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 | |
237 | + | |
238 | +if test $ac_cv_prog_gcc = yes; then | |
239 | + GCC=yes | |
240 | +else | |
241 | + GCC= | |
242 | +fi | |
243 | + | |
244 | +ac_test_CFLAGS="${CFLAGS+set}" | |
245 | +ac_save_CFLAGS="$CFLAGS" | |
246 | +CFLAGS= | |
247 | +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
248 | +echo "configure:738: checking whether ${CC-cc} accepts -g" >&5 | |
249 | +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
250 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
251 | +else | |
252 | + echo 'void f(){}' > conftest.c | |
253 | +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then | |
254 | + ac_cv_prog_cc_g=yes | |
255 | +else | |
256 | + ac_cv_prog_cc_g=no | |
257 | +fi | |
258 | +rm -f conftest* | |
259 | + | |
260 | +fi | |
261 | + | |
262 | +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 | |
263 | +if test "$ac_test_CFLAGS" = set; then | |
264 | + CFLAGS="$ac_save_CFLAGS" | |
265 | +elif test $ac_cv_prog_cc_g = yes; then | |
266 | + if test "$GCC" = yes; then | |
267 | + CFLAGS="-g -O2" | |
268 | + else | |
269 | + CFLAGS="-g" | |
270 | + fi | |
271 | +else | |
272 | + if test "$GCC" = yes; then | |
273 | + CFLAGS="-O2" | |
274 | + else | |
275 | + CFLAGS= | |
276 | + fi | |
277 | +fi | |
278 | + | |
279 | + | |
280 | +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | |
281 | +echo "configure:771: checking how to run the C preprocessor" >&5 | |
282 | +# On Suns, sometimes $CPP names a directory. | |
283 | +if test -n "$CPP" && test -d "$CPP"; then | |
284 | + CPP= | |
285 | +fi | |
286 | +if test -z "$CPP"; then | |
287 | +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then | |
288 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
289 | +else | |
290 | + # This must be in double quotes, not single quotes, because CPP may get | |
291 | + # substituted into the Makefile and "${CC-cc}" will confuse make. | |
292 | + CPP="${CC-cc} -E" | |
293 | + # On the NeXT, cc -E runs the code through the compiler's parser, | |
294 | + # not just through cpp. | |
295 | + cat > conftest.$ac_ext <<EOF | |
296 | +#line 786 "configure" | |
297 | +#include "confdefs.h" | |
298 | +#include <assert.h> | |
299 | +Syntax Error | |
300 | +EOF | |
301 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
302 | +{ (eval echo configure:792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
303 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
304 | +if test -z "$ac_err"; then | |
305 | + : | |
306 | +else | |
307 | + echo "$ac_err" >&5 | |
308 | + echo "configure: failed program was:" >&5 | |
309 | + cat conftest.$ac_ext >&5 | |
310 | + rm -rf conftest* | |
311 | + CPP="${CC-cc} -E -traditional-cpp" | |
312 | + cat > conftest.$ac_ext <<EOF | |
313 | +#line 803 "configure" | |
314 | +#include "confdefs.h" | |
315 | +#include <assert.h> | |
316 | +Syntax Error | |
317 | +EOF | |
318 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
319 | +{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
320 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
321 | +if test -z "$ac_err"; then | |
322 | + : | |
323 | +else | |
324 | + echo "$ac_err" >&5 | |
325 | + echo "configure: failed program was:" >&5 | |
326 | + cat conftest.$ac_ext >&5 | |
327 | + rm -rf conftest* | |
328 | + CPP="${CC-cc} -nologo -E" | |
329 | + cat > conftest.$ac_ext <<EOF | |
330 | +#line 820 "configure" | |
331 | +#include "confdefs.h" | |
332 | +#include <assert.h> | |
333 | +Syntax Error | |
334 | +EOF | |
335 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
336 | +{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
337 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
338 | +if test -z "$ac_err"; then | |
339 | + : | |
340 | +else | |
341 | + echo "$ac_err" >&5 | |
342 | + echo "configure: failed program was:" >&5 | |
343 | + cat conftest.$ac_ext >&5 | |
344 | + rm -rf conftest* | |
345 | + CPP=/lib/cpp | |
346 | +fi | |
347 | +rm -f conftest* | |
348 | +fi | |
349 | +rm -f conftest* | |
350 | +fi | |
351 | +rm -f conftest* | |
352 | + ac_cv_prog_CPP="$CPP" | |
353 | +fi | |
354 | + CPP="$ac_cv_prog_CPP" | |
355 | +else | |
356 | + ac_cv_prog_CPP="$CPP" | |
357 | +fi | |
358 | +echo "$ac_t""$CPP" 1>&6 | |
359 | + | |
360 | +echo $ac_n "checking for AIX""... $ac_c" 1>&6 | |
361 | +echo "configure:851: checking for AIX" >&5 | |
362 | +cat > conftest.$ac_ext <<EOF | |
363 | +#line 853 "configure" | |
364 | +#include "confdefs.h" | |
365 | +#ifdef _AIX | |
366 | + yes | |
367 | +#endif | |
368 | + | |
369 | +EOF | |
370 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
371 | + egrep "yes" >/dev/null 2>&1; then | |
372 | + rm -rf conftest* | |
373 | + echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF | |
374 | +#define _ALL_SOURCE 1 | |
375 | +EOF | |
376 | + | |
377 | +else | |
378 | + rm -rf conftest* | |
379 | + echo "$ac_t""no" 1>&6 | |
380 | +fi | |
381 | +rm -f conftest* | |
382 | + | |
383 | + | |
384 | + | |
385 | ac_aux_dir= | |
386 | for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | |
387 | if test -f $ac_dir/install-sh; then | |
388 | @@ -558,26 +892,26 @@ | |
389 | ||
390 | ||
391 | # Make sure we can run config.sub. | |
392 | -if $ac_config_sub sun4 >/dev/null 2>&1; then : | |
393 | +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : | |
394 | else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } | |
395 | fi | |
396 | ||
397 | echo $ac_n "checking host system type""... $ac_c" 1>&6 | |
398 | -echo "configure:567: checking host system type" >&5 | |
399 | +echo "configure:901: checking host system type" >&5 | |
400 | ||
401 | host_alias=$host | |
402 | case "$host_alias" in | |
403 | NONE) | |
404 | case $nonopt in | |
405 | NONE) | |
406 | - if host_alias=`$ac_config_guess`; then : | |
407 | + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : | |
408 | else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } | |
409 | fi ;; | |
410 | *) host_alias=$nonopt ;; | |
411 | esac ;; | |
412 | esac | |
413 | ||
414 | -host=`$ac_config_sub $host_alias` | |
415 | +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` | |
416 | host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | |
417 | host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | |
418 | host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | |
419 | @@ -588,6 +922,376 @@ | |
420 | EOF | |
421 | ||
422 | ||
423 | +echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6 | |
424 | +echo "configure:927: checking whether to enable ipv6" >&5 | |
425 | +# Check whether --enable-ipv6 or --disable-ipv6 was given. | |
426 | +if test "${enable_ipv6+set}" = set; then | |
427 | + enableval="$enable_ipv6" | |
428 | + case "$enableval" in | |
429 | + no) | |
430 | + echo "$ac_t""no" 1>&6 | |
431 | + ipv6=no | |
432 | + ;; | |
433 | + *) echo "$ac_t""yes" 1>&6 | |
434 | + cat >> confdefs.h <<\EOF | |
435 | +#define ENABLE_IPV6 1 | |
436 | +EOF | |
437 | + | |
438 | + ipv6=yes | |
439 | + ;; | |
440 | + esac | |
441 | +else | |
442 | + if test "$cross_compiling" = yes; then | |
443 | + echo "$ac_t""no" 1>&6 | |
444 | + ipv6=no | |
445 | + | |
446 | +else | |
447 | + cat > conftest.$ac_ext <<EOF | |
448 | +#line 951 "configure" | |
449 | +#include "confdefs.h" | |
450 | + /* AF_INET6 avalable check */ | |
451 | +#include <sys/types.h> | |
452 | +#include <sys/socket.h> | |
453 | +main() | |
454 | +{ | |
455 | + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) | |
456 | + exit(1); | |
457 | + else | |
458 | + exit(0); | |
459 | +} | |
460 | + | |
461 | +EOF | |
462 | +if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
463 | +then | |
464 | + echo "$ac_t""yes" 1>&6 | |
465 | + cat >> confdefs.h <<\EOF | |
466 | +#define ENABLE_IPV6 1 | |
467 | +EOF | |
468 | + | |
469 | + ipv6=yes | |
470 | +else | |
471 | + echo "configure: failed program was:" >&5 | |
472 | + cat conftest.$ac_ext >&5 | |
473 | + rm -fr conftest* | |
474 | + echo "$ac_t""no" 1>&6 | |
475 | + ipv6=no | |
476 | +fi | |
477 | +rm -fr conftest* | |
478 | +fi | |
479 | + | |
480 | +fi | |
481 | + | |
482 | + | |
483 | +ipv6type=unknown | |
484 | +ipv6lib=none | |
485 | + | |
486 | +if test "$ipv6" = "yes"; then | |
487 | + echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 | |
488 | +echo "configure:991: checking ipv6 stack type" >&5 | |
489 | + for i in inria kame linux toshiba v6d zeta; do | |
490 | + case $i in | |
491 | + inria) | |
492 | + cat > conftest.$ac_ext <<EOF | |
493 | +#line 996 "configure" | |
494 | +#include "confdefs.h" | |
495 | +dnl | |
496 | +#include <netinet/in.h> | |
497 | +#ifdef IPV6_INRIA_VERSION | |
498 | +yes | |
499 | +#endif | |
500 | +EOF | |
501 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
502 | + egrep "yes" >/dev/null 2>&1; then | |
503 | + rm -rf conftest* | |
504 | + ipv6type=$i; | |
505 | + CFLAGS="-DINET6 $CFLAGS" | |
506 | +fi | |
507 | +rm -f conftest* | |
508 | + | |
509 | + ;; | |
510 | + kame) | |
511 | + cat > conftest.$ac_ext <<EOF | |
512 | +#line 1015 "configure" | |
513 | +#include "confdefs.h" | |
514 | +dnl | |
515 | +#include <netinet/in.h> | |
516 | +#ifdef __KAME__ | |
517 | +yes | |
518 | +#endif | |
519 | +EOF | |
520 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
521 | + egrep "yes" >/dev/null 2>&1; then | |
522 | + rm -rf conftest* | |
523 | + ipv6type=$i; | |
524 | + ipv6lib=inet6; | |
525 | + ipv6libdir=/usr/local/v6/lib; | |
526 | + CFLAGS="-DINET6 $CFLAGS" | |
527 | +fi | |
528 | +rm -f conftest* | |
529 | + | |
530 | + ;; | |
531 | + linux) | |
532 | + if test -d /usr/inet6; then | |
533 | + ipv6type=$i | |
534 | + ipv6lib=inet6 | |
535 | + ipv6libdir=/usr/inet6/lib | |
536 | + CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS" | |
537 | + fi | |
538 | + ;; | |
539 | + toshiba) | |
540 | + cat > conftest.$ac_ext <<EOF | |
541 | +#line 1044 "configure" | |
542 | +#include "confdefs.h" | |
543 | +dnl | |
544 | +#include <sys/param.h> | |
545 | +#ifdef _TOSHIBA_INET6 | |
546 | +yes | |
547 | +#endif | |
548 | +EOF | |
549 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
550 | + egrep "yes" >/dev/null 2>&1; then | |
551 | + rm -rf conftest* | |
552 | + ipv6type=$i; | |
553 | + ipv6lib=inet6; | |
554 | + ipv6libdir=/usr/local/v6/lib; | |
555 | + CFLAGS="-DINET6 $CFLAGS" | |
556 | +fi | |
557 | +rm -f conftest* | |
558 | + | |
559 | + ;; | |
560 | + v6d) | |
561 | + cat > conftest.$ac_ext <<EOF | |
562 | +#line 1065 "configure" | |
563 | +#include "confdefs.h" | |
564 | +dnl | |
565 | +#include </usr/local/v6/include/sys/v6config.h> | |
566 | +#ifdef __V6D__ | |
567 | +yes | |
568 | +#endif | |
569 | +EOF | |
570 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
571 | + egrep "yes" >/dev/null 2>&1; then | |
572 | + rm -rf conftest* | |
573 | + ipv6type=$i; | |
574 | + ipv6lib=v6; | |
575 | + ipv6libdir=/usr/local/v6/lib; | |
576 | + CFLAGS="-I/usr/local/v6/include $CFLAGS" | |
577 | +fi | |
578 | +rm -f conftest* | |
579 | + | |
580 | + ;; | |
581 | + zeta) | |
582 | + cat > conftest.$ac_ext <<EOF | |
583 | +#line 1086 "configure" | |
584 | +#include "confdefs.h" | |
585 | +dnl | |
586 | +#include <sys/param.h> | |
587 | +#ifdef _ZETA_MINAMI_INET6 | |
588 | +yes | |
589 | +#endif | |
590 | +EOF | |
591 | +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
592 | + egrep "yes" >/dev/null 2>&1; then | |
593 | + rm -rf conftest* | |
594 | + ipv6type=$i; | |
595 | + ipv6lib=inet6; | |
596 | + ipv6libdir=/usr/local/v6/lib; | |
597 | + CFLAGS="-DINET6 $CFLAGS" | |
598 | +fi | |
599 | +rm -f conftest* | |
600 | + | |
601 | + ;; | |
602 | + esac | |
603 | + if test "$ipv6type" != "unknown"; then | |
604 | + break | |
605 | + fi | |
606 | + done | |
607 | + echo "$ac_t""$ipv6type" 1>&6 | |
608 | +fi | |
609 | + | |
610 | +if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then | |
611 | + if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then | |
612 | + LIBS="-L$ipv6libdir -l$ipv6lib $LIBS" | |
613 | + else | |
614 | + echo 'Fatal: no $ipv6lib library found. cannot continue.' | |
615 | + echo "You need to fetch lib$ipv6lib.a from appropriate" | |
616 | + echo 'ipv6 kit and compile beforehand.' | |
617 | + exit 1 | |
618 | + fi | |
619 | +fi | |
620 | + | |
621 | +echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6 | |
622 | +echo "configure:1125: checking getaddrinfo bug" >&5 | |
623 | +if test "$cross_compiling" = yes; then | |
624 | + echo "$ac_t""buggy" 1>&6 | |
625 | +buggygetaddrinfo=yes | |
626 | +else | |
627 | + cat > conftest.$ac_ext <<EOF | |
628 | +#line 1131 "configure" | |
629 | +#include "confdefs.h" | |
630 | + | |
631 | +#include <sys/types.h> | |
632 | +#include <netdb.h> | |
633 | +#include <string.h> | |
634 | +#include <sys/socket.h> | |
635 | +#include <netinet/in.h> | |
636 | + | |
637 | +main() | |
638 | +{ | |
639 | + int passive, gaierr, inet4 = 0, inet6 = 0; | |
640 | + struct addrinfo hints, *ai, *aitop; | |
641 | + char straddr[INET6_ADDRSTRLEN], strport[16]; | |
642 | + | |
643 | + for (passive = 0; passive <= 1; passive++) { | |
644 | + memset(&hints, 0, sizeof(hints)); | |
645 | + hints.ai_family = AF_UNSPEC; | |
646 | + hints.ai_flags = passive ? AI_PASSIVE : 0; | |
647 | + hints.ai_socktype = SOCK_STREAM; | |
648 | + if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) { | |
649 | + (void)gai_strerror(gaierr); | |
650 | + goto bad; | |
651 | + } | |
652 | + for (ai = aitop; ai; ai = ai->ai_next) { | |
653 | + if (ai->ai_addr == NULL || | |
654 | + ai->ai_addrlen == 0 || | |
655 | + getnameinfo(ai->ai_addr, ai->ai_addrlen, | |
656 | + straddr, sizeof(straddr), strport, sizeof(strport), | |
657 | + NI_NUMERICHOST|NI_NUMERICSERV) != 0) { | |
658 | + goto bad; | |
659 | + } | |
660 | + if (strcmp(strport, "54321") != 0) { | |
661 | + goto bad; | |
662 | + } | |
663 | + switch (ai->ai_family) { | |
664 | + case AF_INET: | |
665 | + if (passive) { | |
666 | + if (strcmp(straddr, "0.0.0.0") != 0) { | |
667 | + goto bad; | |
668 | + } | |
669 | + } else { | |
670 | + if (strcmp(straddr, "127.0.0.1") != 0) { | |
671 | + goto bad; | |
672 | + } | |
673 | + } | |
674 | + inet4++; | |
675 | + break; | |
676 | + case AF_INET6: | |
677 | + if (passive) { | |
678 | + if (strcmp(straddr, "::") != 0) { | |
679 | + goto bad; | |
680 | + } | |
681 | + } else { | |
682 | + if (strcmp(straddr, "::1") != 0) { | |
683 | + goto bad; | |
684 | + } | |
685 | + } | |
686 | + inet6++; | |
687 | + break; | |
688 | + case AF_UNSPEC: | |
689 | + goto bad; | |
690 | + break; | |
691 | + default: | |
692 | + /* another family support? */ | |
693 | + break; | |
694 | + } | |
695 | + } | |
696 | + } | |
697 | + | |
698 | + if (inet6 != 2 || inet4 != 2) | |
699 | + goto bad; | |
700 | + | |
701 | + if (aitop) | |
702 | + freeaddrinfo(aitop); | |
703 | + exit(0); | |
704 | + | |
705 | + bad: | |
706 | + if (aitop) | |
707 | + freeaddrinfo(aitop); | |
708 | + exit(1); | |
709 | +} | |
710 | + | |
711 | +EOF | |
712 | +if { (eval echo configure:1215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
713 | +then | |
714 | + echo "$ac_t""good" 1>&6 | |
715 | +buggygetaddrinfo=no | |
716 | +else | |
717 | + echo "configure: failed program was:" >&5 | |
718 | + cat conftest.$ac_ext >&5 | |
719 | + rm -fr conftest* | |
720 | + echo "$ac_t""buggy" 1>&6 | |
721 | +buggygetaddrinfo=yes | |
722 | +fi | |
723 | +rm -fr conftest* | |
724 | +fi | |
725 | + | |
726 | + | |
727 | +if test "$buggygetaddrinfo" = "yes"; then | |
728 | + if test "$ipv6" = "yes"; then | |
729 | + echo 'Fatal: You must get working getaddrinfo() function.' | |
730 | + echo ' or you can specify "--disable-ipv6"'. | |
731 | + exit 1 | |
732 | + else | |
733 | + for ac_func in getaddrinfo getnameinfo | |
734 | +do | |
735 | +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
736 | +echo "configure:1239: checking for $ac_func" >&5 | |
737 | +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
738 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
739 | +else | |
740 | + cat > conftest.$ac_ext <<EOF | |
741 | +#line 1244 "configure" | |
742 | +#include "confdefs.h" | |
743 | +/* System header to define __stub macros and hopefully few prototypes, | |
744 | + which can conflict with char $ac_func(); below. */ | |
745 | +#include <assert.h> | |
746 | +/* Override any gcc2 internal prototype to avoid an error. */ | |
747 | +/* We use char because int might match the return type of a gcc2 | |
748 | + builtin and then its argument prototype would still apply. */ | |
749 | +char $ac_func(); | |
750 | + | |
751 | +int main() { | |
752 | + | |
753 | +/* The GNU C library defines this for functions which it implements | |
754 | + to always fail with ENOSYS. Some functions are actually named | |
755 | + something starting with __ and the normal name is an alias. */ | |
756 | +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | |
757 | +choke me | |
758 | +#else | |
759 | +$ac_func(); | |
760 | +#endif | |
761 | + | |
762 | +; return 0; } | |
763 | +EOF | |
764 | +if { (eval echo configure:1267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
765 | + rm -rf conftest* | |
766 | + eval "ac_cv_func_$ac_func=yes" | |
767 | +else | |
768 | + echo "configure: failed program was:" >&5 | |
769 | + cat conftest.$ac_ext >&5 | |
770 | + rm -rf conftest* | |
771 | + eval "ac_cv_func_$ac_func=no" | |
772 | +fi | |
773 | +rm -f conftest* | |
774 | +fi | |
775 | + | |
776 | +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then | |
777 | + echo "$ac_t""yes" 1>&6 | |
778 | + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` | |
779 | + cat >> confdefs.h <<EOF | |
780 | +#define $ac_tr_func 1 | |
781 | +EOF | |
782 | + | |
783 | +else | |
784 | + echo "$ac_t""no" 1>&6 | |
785 | +LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" | |
786 | +fi | |
787 | +done | |
788 | + | |
789 | + | |
790 | + fi | |
791 | +fi | |
792 | + | |
793 | # Check whether --with-socks or --without-socks was given. | |
794 | if test "${with_socks+set}" = set; then | |
795 | withval="$with_socks" | |
796 | @@ -648,7 +1352,7 @@ | |
797 | ||
798 | ||
799 | echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 | |
800 | -echo "configure:652: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
801 | +echo "configure:1356: checking whether ${MAKE-make} sets \${MAKE}" >&5 | |
802 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` | |
803 | if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then | |
804 | echo $ac_n "(cached) $ac_c" 1>&6 | |
805 | @@ -682,28 +1386,30 @@ | |
806 | # SunOS /usr/etc/install | |
807 | # IRIX /sbin/install | |
808 | # AIX /bin/install | |
809 | +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag | |
810 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | |
811 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | |
812 | # ./install, which can be erroneously created by make from ./install.sh. | |
813 | echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 | |
814 | -echo "configure:690: checking for a BSD compatible install" >&5 | |
815 | +echo "configure:1395: checking for a BSD compatible install" >&5 | |
816 | if test -z "$INSTALL"; then | |
817 | if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then | |
818 | echo $ac_n "(cached) $ac_c" 1>&6 | |
819 | else | |
820 | - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" | |
821 | + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" | |
822 | for ac_dir in $PATH; do | |
823 | # Account for people who put trailing slashes in PATH elements. | |
824 | case "$ac_dir/" in | |
825 | /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; | |
826 | *) | |
827 | # OSF1 and SCO ODT 3.0 have their own names for install. | |
828 | - for ac_prog in ginstall installbsd scoinst install; do | |
829 | + # Don't use installbsd from OSF since it installs stuff as root | |
830 | + # by default. | |
831 | + for ac_prog in ginstall scoinst install; do | |
832 | if test -f $ac_dir/$ac_prog; then | |
833 | if test $ac_prog = install && | |
834 | grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then | |
835 | # AIX install. It has an incompatible calling convention. | |
836 | - # OSF/1 installbsd also uses dspmsg, but is usable. | |
837 | : | |
838 | else | |
839 | ac_cv_path_install="$ac_dir/$ac_prog -c" | |
840 | @@ -733,6 +1439,8 @@ | |
841 | # It thinks the first close brace ends the variable substitution. | |
842 | test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' | |
843 | ||
844 | +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' | |
845 | + | |
846 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
847 | ||
848 | ||
849 | @@ -740,177 +1448,6 @@ | |
850 | test -z "$CFLAGS" && CFLAGS= auto_cflags=1 | |
851 | test -z "$CC" && cc_specified=yes | |
852 | ||
853 | -# Extract the first word of "gcc", so it can be a program name with args. | |
854 | -set dummy gcc; ac_word=$2 | |
855 | -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
856 | -echo "configure:747: checking for $ac_word" >&5 | |
857 | -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
858 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
859 | -else | |
860 | - if test -n "$CC"; then | |
861 | - ac_cv_prog_CC="$CC" # Let the user override the test. | |
862 | -else | |
863 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
864 | - for ac_dir in $PATH; do | |
865 | - test -z "$ac_dir" && ac_dir=. | |
866 | - if test -f $ac_dir/$ac_word; then | |
867 | - ac_cv_prog_CC="gcc" | |
868 | - break | |
869 | - fi | |
870 | - done | |
871 | - IFS="$ac_save_ifs" | |
872 | -fi | |
873 | -fi | |
874 | -CC="$ac_cv_prog_CC" | |
875 | -if test -n "$CC"; then | |
876 | - echo "$ac_t""$CC" 1>&6 | |
877 | -else | |
878 | - echo "$ac_t""no" 1>&6 | |
879 | -fi | |
880 | - | |
881 | -if test -z "$CC"; then | |
882 | - # Extract the first word of "cc", so it can be a program name with args. | |
883 | -set dummy cc; ac_word=$2 | |
884 | -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
885 | -echo "configure:776: checking for $ac_word" >&5 | |
886 | -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
887 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
888 | -else | |
889 | - if test -n "$CC"; then | |
890 | - ac_cv_prog_CC="$CC" # Let the user override the test. | |
891 | -else | |
892 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
893 | - ac_prog_rejected=no | |
894 | - for ac_dir in $PATH; do | |
895 | - test -z "$ac_dir" && ac_dir=. | |
896 | - if test -f $ac_dir/$ac_word; then | |
897 | - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then | |
898 | - ac_prog_rejected=yes | |
899 | - continue | |
900 | - fi | |
901 | - ac_cv_prog_CC="cc" | |
902 | - break | |
903 | - fi | |
904 | - done | |
905 | - IFS="$ac_save_ifs" | |
906 | -if test $ac_prog_rejected = yes; then | |
907 | - # We found a bogon in the path, so make sure we never use it. | |
908 | - set dummy $ac_cv_prog_CC | |
909 | - shift | |
910 | - if test $# -gt 0; then | |
911 | - # We chose a different compiler from the bogus one. | |
912 | - # However, it has the same basename, so the bogon will be chosen | |
913 | - # first if we set CC to just the basename; use the full file name. | |
914 | - shift | |
915 | - set dummy "$ac_dir/$ac_word" "$@" | |
916 | - shift | |
917 | - ac_cv_prog_CC="$@" | |
918 | - fi | |
919 | -fi | |
920 | -fi | |
921 | -fi | |
922 | -CC="$ac_cv_prog_CC" | |
923 | -if test -n "$CC"; then | |
924 | - echo "$ac_t""$CC" 1>&6 | |
925 | -else | |
926 | - echo "$ac_t""no" 1>&6 | |
927 | -fi | |
928 | - | |
929 | - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } | |
930 | -fi | |
931 | - | |
932 | -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
933 | -echo "configure:824: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
934 | - | |
935 | -ac_ext=c | |
936 | -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
937 | -ac_cpp='$CPP $CPPFLAGS' | |
938 | -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' | |
939 | -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' | |
940 | -cross_compiling=$ac_cv_prog_cc_cross | |
941 | - | |
942 | -cat > conftest.$ac_ext <<EOF | |
943 | -#line 834 "configure" | |
944 | -#include "confdefs.h" | |
945 | -main(){return(0);} | |
946 | -EOF | |
947 | -if { (eval echo configure:838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
948 | - ac_cv_prog_cc_works=yes | |
949 | - # If we can't run a trivial program, we are probably using a cross compiler. | |
950 | - if (./conftest; exit) 2>/dev/null; then | |
951 | - ac_cv_prog_cc_cross=no | |
952 | - else | |
953 | - ac_cv_prog_cc_cross=yes | |
954 | - fi | |
955 | -else | |
956 | - echo "configure: failed program was:" >&5 | |
957 | - cat conftest.$ac_ext >&5 | |
958 | - ac_cv_prog_cc_works=no | |
959 | -fi | |
960 | -rm -fr conftest* | |
961 | - | |
962 | -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 | |
963 | -if test $ac_cv_prog_cc_works = no; then | |
964 | - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | |
965 | -fi | |
966 | -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
967 | -echo "configure:858: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
968 | -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
969 | -cross_compiling=$ac_cv_prog_cc_cross | |
970 | - | |
971 | -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
972 | -echo "configure:863: checking whether we are using GNU C" >&5 | |
973 | -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
974 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
975 | -else | |
976 | - cat > conftest.c <<EOF | |
977 | -#ifdef __GNUC__ | |
978 | - yes; | |
979 | -#endif | |
980 | -EOF | |
981 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
982 | - ac_cv_prog_gcc=yes | |
983 | -else | |
984 | - ac_cv_prog_gcc=no | |
985 | -fi | |
986 | -fi | |
987 | - | |
988 | -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 | |
989 | - | |
990 | -if test $ac_cv_prog_gcc = yes; then | |
991 | - GCC=yes | |
992 | - ac_test_CFLAGS="${CFLAGS+set}" | |
993 | - ac_save_CFLAGS="$CFLAGS" | |
994 | - CFLAGS= | |
995 | - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
996 | -echo "configure:887: checking whether ${CC-cc} accepts -g" >&5 | |
997 | -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
998 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
999 | -else | |
1000 | - echo 'void f(){}' > conftest.c | |
1001 | -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then | |
1002 | - ac_cv_prog_cc_g=yes | |
1003 | -else | |
1004 | - ac_cv_prog_cc_g=no | |
1005 | -fi | |
1006 | -rm -f conftest* | |
1007 | - | |
1008 | -fi | |
1009 | - | |
1010 | -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 | |
1011 | - if test "$ac_test_CFLAGS" = set; then | |
1012 | - CFLAGS="$ac_save_CFLAGS" | |
1013 | - elif test $ac_cv_prog_cc_g = yes; then | |
1014 | - CFLAGS="-g -O2" | |
1015 | - else | |
1016 | - CFLAGS="-O2" | |
1017 | - fi | |
1018 | -else | |
1019 | - GCC= | |
1020 | - test "${CFLAGS+set}" = set || CFLAGS="-g" | |
1021 | -fi | |
1022 | - | |
1023 | - | |
1024 | if test -n "$auto_cflags"; then | |
1025 | if test -n "$GCC"; then | |
1026 | CFLAGS="$CFLAGS -O2 -Wall -Wno-implicit" | |
1027 | @@ -923,92 +1460,6 @@ | |
1028 | fi | |
1029 | fi | |
1030 | ||
1031 | -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | |
1032 | -echo "configure:928: checking how to run the C preprocessor" >&5 | |
1033 | -# On Suns, sometimes $CPP names a directory. | |
1034 | -if test -n "$CPP" && test -d "$CPP"; then | |
1035 | - CPP= | |
1036 | -fi | |
1037 | -if test -z "$CPP"; then | |
1038 | -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then | |
1039 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
1040 | -else | |
1041 | - # This must be in double quotes, not single quotes, because CPP may get | |
1042 | - # substituted into the Makefile and "${CC-cc}" will confuse make. | |
1043 | - CPP="${CC-cc} -E" | |
1044 | - # On the NeXT, cc -E runs the code through the compiler's parser, | |
1045 | - # not just through cpp. | |
1046 | - cat > conftest.$ac_ext <<EOF | |
1047 | -#line 943 "configure" | |
1048 | -#include "confdefs.h" | |
1049 | -#include <assert.h> | |
1050 | -Syntax Error | |
1051 | -EOF | |
1052 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1053 | -{ (eval echo configure:949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1054 | -ac_err=`grep -v '^ *+' conftest.out` | |
1055 | -if test -z "$ac_err"; then | |
1056 | - : | |
1057 | -else | |
1058 | - echo "$ac_err" >&5 | |
1059 | - echo "configure: failed program was:" >&5 | |
1060 | - cat conftest.$ac_ext >&5 | |
1061 | - rm -rf conftest* | |
1062 | - CPP="${CC-cc} -E -traditional-cpp" | |
1063 | - cat > conftest.$ac_ext <<EOF | |
1064 | -#line 960 "configure" | |
1065 | -#include "confdefs.h" | |
1066 | -#include <assert.h> | |
1067 | -Syntax Error | |
1068 | -EOF | |
1069 | -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1070 | -{ (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1071 | -ac_err=`grep -v '^ *+' conftest.out` | |
1072 | -if test -z "$ac_err"; then | |
1073 | - : | |
1074 | -else | |
1075 | - echo "$ac_err" >&5 | |
1076 | - echo "configure: failed program was:" >&5 | |
1077 | - cat conftest.$ac_ext >&5 | |
1078 | - rm -rf conftest* | |
1079 | - CPP=/lib/cpp | |
1080 | -fi | |
1081 | -rm -f conftest* | |
1082 | -fi | |
1083 | -rm -f conftest* | |
1084 | - ac_cv_prog_CPP="$CPP" | |
1085 | -fi | |
1086 | - CPP="$ac_cv_prog_CPP" | |
1087 | -else | |
1088 | - ac_cv_prog_CPP="$CPP" | |
1089 | -fi | |
1090 | -echo "$ac_t""$CPP" 1>&6 | |
1091 | - | |
1092 | -echo $ac_n "checking for AIX""... $ac_c" 1>&6 | |
1093 | -echo "configure:989: checking for AIX" >&5 | |
1094 | -cat > conftest.$ac_ext <<EOF | |
1095 | -#line 991 "configure" | |
1096 | -#include "confdefs.h" | |
1097 | -#ifdef _AIX | |
1098 | - yes | |
1099 | -#endif | |
1100 | - | |
1101 | -EOF | |
1102 | -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
1103 | - egrep "yes" >/dev/null 2>&1; then | |
1104 | - rm -rf conftest* | |
1105 | - echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF | |
1106 | -#define _ALL_SOURCE 1 | |
1107 | -EOF | |
1108 | - | |
1109 | -else | |
1110 | - rm -rf conftest* | |
1111 | - echo "$ac_t""no" 1>&6 | |
1112 | -fi | |
1113 | -rm -f conftest* | |
1114 | - | |
1115 | - | |
1116 | - | |
1117 | case "$host_os" in | |
1118 | *win32) exeext='.exe';; | |
1119 | *) exeext='';; | |
1120 | @@ -1017,7 +1468,7 @@ | |
1121 | ||
1122 | ||
1123 | echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 | |
1124 | -echo "configure:1021: checking for ${CC-cc} option to accept ANSI C" >&5 | |
1125 | +echo "configure:1472: checking for ${CC-cc} option to accept ANSI C" >&5 | |
1126 | if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then | |
1127 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1128 | else | |
1129 | @@ -1033,7 +1484,7 @@ | |
1130 | do | |
1131 | CC="$ac_save_CC $ac_arg" | |
1132 | cat > conftest.$ac_ext <<EOF | |
1133 | -#line 1037 "configure" | |
1134 | +#line 1488 "configure" | |
1135 | #include "confdefs.h" | |
1136 | #if !defined(__STDC__) || __STDC__ != 1 | |
1137 | choke me | |
1138 | @@ -1051,7 +1502,7 @@ | |
1139 | struct s2 {int (*f) (double a);}; | |
1140 | ; return 0; } | |
1141 | EOF | |
1142 | -if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1143 | +if { (eval echo configure:1506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1144 | rm -rf conftest* | |
1145 | am_cv_prog_cc_stdc="$ac_arg"; break | |
1146 | else | |
1147 | @@ -1073,7 +1524,7 @@ | |
1148 | ||
1149 | ||
1150 | echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 | |
1151 | -echo "configure:1077: checking for function prototypes" >&5 | |
1152 | +echo "configure:1528: checking for function prototypes" >&5 | |
1153 | if test "$am_cv_prog_cc_stdc" != no; then | |
1154 | echo "$ac_t""yes" 1>&6 | |
1155 | cat >> confdefs.h <<\EOF | |
1156 | @@ -1086,12 +1537,12 @@ | |
1157 | U=_ ANSI2KNR=./ansi2knr | |
1158 | # Ensure some checks needed by ansi2knr itself. | |
1159 | echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
1160 | -echo "configure:1090: checking for ANSI C header files" >&5 | |
1161 | +echo "configure:1541: checking for ANSI C header files" >&5 | |
1162 | if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then | |
1163 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1164 | else | |
1165 | cat > conftest.$ac_ext <<EOF | |
1166 | -#line 1095 "configure" | |
1167 | +#line 1546 "configure" | |
1168 | #include "confdefs.h" | |
1169 | #include <stdlib.h> | |
1170 | #include <stdarg.h> | |
1171 | @@ -1099,8 +1550,8 @@ | |
1172 | #include <float.h> | |
1173 | EOF | |
1174 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1175 | -{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1176 | -ac_err=`grep -v '^ *+' conftest.out` | |
1177 | +{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1178 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1179 | if test -z "$ac_err"; then | |
1180 | rm -rf conftest* | |
1181 | ac_cv_header_stdc=yes | |
1182 | @@ -1116,7 +1567,7 @@ | |
1183 | if test $ac_cv_header_stdc = yes; then | |
1184 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | |
1185 | cat > conftest.$ac_ext <<EOF | |
1186 | -#line 1120 "configure" | |
1187 | +#line 1571 "configure" | |
1188 | #include "confdefs.h" | |
1189 | #include <string.h> | |
1190 | EOF | |
1191 | @@ -1134,7 +1585,7 @@ | |
1192 | if test $ac_cv_header_stdc = yes; then | |
1193 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | |
1194 | cat > conftest.$ac_ext <<EOF | |
1195 | -#line 1138 "configure" | |
1196 | +#line 1589 "configure" | |
1197 | #include "confdefs.h" | |
1198 | #include <stdlib.h> | |
1199 | EOF | |
1200 | @@ -1155,7 +1606,7 @@ | |
1201 | : | |
1202 | else | |
1203 | cat > conftest.$ac_ext <<EOF | |
1204 | -#line 1159 "configure" | |
1205 | +#line 1610 "configure" | |
1206 | #include "confdefs.h" | |
1207 | #include <ctype.h> | |
1208 | #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
1209 | @@ -1166,7 +1617,7 @@ | |
1210 | exit (0); } | |
1211 | ||
1212 | EOF | |
1213 | -if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | |
1214 | +if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1215 | then | |
1216 | : | |
1217 | else | |
1218 | @@ -1193,18 +1644,18 @@ | |
1219 | do | |
1220 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1221 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1222 | -echo "configure:1197: checking for $ac_hdr" >&5 | |
1223 | +echo "configure:1648: checking for $ac_hdr" >&5 | |
1224 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1225 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1226 | else | |
1227 | cat > conftest.$ac_ext <<EOF | |
1228 | -#line 1202 "configure" | |
1229 | +#line 1653 "configure" | |
1230 | #include "confdefs.h" | |
1231 | #include <$ac_hdr> | |
1232 | EOF | |
1233 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1234 | -{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1235 | -ac_err=`grep -v '^ *+' conftest.out` | |
1236 | +{ (eval echo configure:1658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1237 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1238 | if test -z "$ac_err"; then | |
1239 | rm -rf conftest* | |
1240 | eval "ac_cv_header_$ac_safe=yes" | |
1241 | @@ -1233,12 +1684,12 @@ | |
1242 | ||
1243 | ||
1244 | echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
1245 | -echo "configure:1237: checking for working const" >&5 | |
1246 | +echo "configure:1688: checking for working const" >&5 | |
1247 | if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then | |
1248 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1249 | else | |
1250 | cat > conftest.$ac_ext <<EOF | |
1251 | -#line 1242 "configure" | |
1252 | +#line 1693 "configure" | |
1253 | #include "confdefs.h" | |
1254 | ||
1255 | int main() { | |
1256 | @@ -1287,7 +1738,7 @@ | |
1257 | ||
1258 | ; return 0; } | |
1259 | EOF | |
1260 | -if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1261 | +if { (eval echo configure:1742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1262 | rm -rf conftest* | |
1263 | ac_cv_c_const=yes | |
1264 | else | |
1265 | @@ -1308,12 +1759,12 @@ | |
1266 | fi | |
1267 | ||
1268 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
1269 | -echo "configure:1312: checking for size_t" >&5 | |
1270 | +echo "configure:1763: checking for size_t" >&5 | |
1271 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | |
1272 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1273 | else | |
1274 | cat > conftest.$ac_ext <<EOF | |
1275 | -#line 1317 "configure" | |
1276 | +#line 1768 "configure" | |
1277 | #include "confdefs.h" | |
1278 | #include <sys/types.h> | |
1279 | #if STDC_HEADERS | |
1280 | @@ -1322,7 +1773,7 @@ | |
1281 | #endif | |
1282 | EOF | |
1283 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
1284 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then | |
1285 | + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then | |
1286 | rm -rf conftest* | |
1287 | ac_cv_type_size_t=yes | |
1288 | else | |
1289 | @@ -1341,12 +1792,12 @@ | |
1290 | fi | |
1291 | ||
1292 | echo $ac_n "checking for pid_t""... $ac_c" 1>&6 | |
1293 | -echo "configure:1345: checking for pid_t" >&5 | |
1294 | +echo "configure:1796: checking for pid_t" >&5 | |
1295 | if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then | |
1296 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1297 | else | |
1298 | cat > conftest.$ac_ext <<EOF | |
1299 | -#line 1350 "configure" | |
1300 | +#line 1801 "configure" | |
1301 | #include "confdefs.h" | |
1302 | #include <sys/types.h> | |
1303 | #if STDC_HEADERS | |
1304 | @@ -1355,7 +1806,7 @@ | |
1305 | #endif | |
1306 | EOF | |
1307 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | |
1308 | - egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then | |
1309 | + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then | |
1310 | rm -rf conftest* | |
1311 | ac_cv_type_pid_t=yes | |
1312 | else | |
1313 | @@ -1374,14 +1825,14 @@ | |
1314 | fi | |
1315 | ||
1316 | echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 | |
1317 | -echo "configure:1378: checking whether byte ordering is bigendian" >&5 | |
1318 | +echo "configure:1829: checking whether byte ordering is bigendian" >&5 | |
1319 | if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then | |
1320 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1321 | else | |
1322 | ac_cv_c_bigendian=unknown | |
1323 | # See if sys/param.h defines the BYTE_ORDER macro. | |
1324 | cat > conftest.$ac_ext <<EOF | |
1325 | -#line 1385 "configure" | |
1326 | +#line 1836 "configure" | |
1327 | #include "confdefs.h" | |
1328 | #include <sys/types.h> | |
1329 | #include <sys/param.h> | |
1330 | @@ -1392,11 +1843,11 @@ | |
1331 | #endif | |
1332 | ; return 0; } | |
1333 | EOF | |
1334 | -if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1335 | +if { (eval echo configure:1847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1336 | rm -rf conftest* | |
1337 | # It does; now see whether it defined to BIG_ENDIAN or not. | |
1338 | cat > conftest.$ac_ext <<EOF | |
1339 | -#line 1400 "configure" | |
1340 | +#line 1851 "configure" | |
1341 | #include "confdefs.h" | |
1342 | #include <sys/types.h> | |
1343 | #include <sys/param.h> | |
1344 | @@ -1407,7 +1858,7 @@ | |
1345 | #endif | |
1346 | ; return 0; } | |
1347 | EOF | |
1348 | -if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1349 | +if { (eval echo configure:1862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1350 | rm -rf conftest* | |
1351 | ac_cv_c_bigendian=yes | |
1352 | else | |
1353 | @@ -1427,7 +1878,7 @@ | |
1354 | { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } | |
1355 | else | |
1356 | cat > conftest.$ac_ext <<EOF | |
1357 | -#line 1431 "configure" | |
1358 | +#line 1882 "configure" | |
1359 | #include "confdefs.h" | |
1360 | main () { | |
1361 | /* Are we little or big endian? From Harbison&Steele. */ | |
1362 | @@ -1440,7 +1891,7 @@ | |
1363 | exit (u.c[sizeof (long) - 1] == 1); | |
1364 | } | |
1365 | EOF | |
1366 | -if { (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | |
1367 | +if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1368 | then | |
1369 | ac_cv_c_bigendian=no | |
1370 | else | |
1371 | @@ -1468,18 +1919,18 @@ | |
1372 | do | |
1373 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1374 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1375 | -echo "configure:1472: checking for $ac_hdr" >&5 | |
1376 | +echo "configure:1923: checking for $ac_hdr" >&5 | |
1377 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1378 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1379 | else | |
1380 | cat > conftest.$ac_ext <<EOF | |
1381 | -#line 1477 "configure" | |
1382 | +#line 1928 "configure" | |
1383 | #include "confdefs.h" | |
1384 | #include <$ac_hdr> | |
1385 | EOF | |
1386 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1387 | -{ (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1388 | -ac_err=`grep -v '^ *+' conftest.out` | |
1389 | +{ (eval echo configure:1933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1390 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1391 | if test -z "$ac_err"; then | |
1392 | rm -rf conftest* | |
1393 | eval "ac_cv_header_$ac_safe=yes" | |
1394 | @@ -1508,18 +1959,18 @@ | |
1395 | do | |
1396 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1397 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1398 | -echo "configure:1512: checking for $ac_hdr" >&5 | |
1399 | +echo "configure:1963: checking for $ac_hdr" >&5 | |
1400 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1401 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1402 | else | |
1403 | cat > conftest.$ac_ext <<EOF | |
1404 | -#line 1517 "configure" | |
1405 | +#line 1968 "configure" | |
1406 | #include "confdefs.h" | |
1407 | #include <$ac_hdr> | |
1408 | EOF | |
1409 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1410 | -{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1411 | -ac_err=`grep -v '^ *+' conftest.out` | |
1412 | +{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1413 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1414 | if test -z "$ac_err"; then | |
1415 | rm -rf conftest* | |
1416 | eval "ac_cv_header_$ac_safe=yes" | |
1417 | @@ -1545,12 +1996,12 @@ | |
1418 | done | |
1419 | ||
1420 | echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 | |
1421 | -echo "configure:1549: checking whether time.h and sys/time.h may both be included" >&5 | |
1422 | +echo "configure:2000: checking whether time.h and sys/time.h may both be included" >&5 | |
1423 | if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then | |
1424 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1425 | else | |
1426 | cat > conftest.$ac_ext <<EOF | |
1427 | -#line 1554 "configure" | |
1428 | +#line 2005 "configure" | |
1429 | #include "confdefs.h" | |
1430 | #include <sys/types.h> | |
1431 | #include <sys/time.h> | |
1432 | @@ -1559,7 +2010,7 @@ | |
1433 | struct tm *tp; | |
1434 | ; return 0; } | |
1435 | EOF | |
1436 | -if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1437 | +if { (eval echo configure:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1438 | rm -rf conftest* | |
1439 | ac_cv_header_time=yes | |
1440 | else | |
1441 | @@ -1581,12 +2032,12 @@ | |
1442 | ||
1443 | ||
1444 | echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 | |
1445 | -echo "configure:1585: checking return type of signal handlers" >&5 | |
1446 | +echo "configure:2036: checking return type of signal handlers" >&5 | |
1447 | if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then | |
1448 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1449 | else | |
1450 | cat > conftest.$ac_ext <<EOF | |
1451 | -#line 1590 "configure" | |
1452 | +#line 2041 "configure" | |
1453 | #include "confdefs.h" | |
1454 | #include <sys/types.h> | |
1455 | #include <signal.h> | |
1456 | @@ -1603,7 +2054,7 @@ | |
1457 | int i; | |
1458 | ; return 0; } | |
1459 | EOF | |
1460 | -if { (eval echo configure:1607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1461 | +if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1462 | rm -rf conftest* | |
1463 | ac_cv_type_signal=void | |
1464 | else | |
1465 | @@ -1623,10 +2074,10 @@ | |
1466 | ||
1467 | ||
1468 | echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 | |
1469 | -echo "configure:1627: checking for struct utimbuf" >&5 | |
1470 | +echo "configure:2078: checking for struct utimbuf" >&5 | |
1471 | if test x"$ac_cv_header_utime_h" = xyes; then | |
1472 | cat > conftest.$ac_ext <<EOF | |
1473 | -#line 1630 "configure" | |
1474 | +#line 2081 "configure" | |
1475 | #include "confdefs.h" | |
1476 | #include <utime.h> | |
1477 | EOF | |
1478 | @@ -1651,19 +2102,19 @@ | |
1479 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | |
1480 | # for constant arguments. Useless! | |
1481 | echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 | |
1482 | -echo "configure:1655: checking for working alloca.h" >&5 | |
1483 | +echo "configure:2106: checking for working alloca.h" >&5 | |
1484 | if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then | |
1485 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1486 | else | |
1487 | cat > conftest.$ac_ext <<EOF | |
1488 | -#line 1660 "configure" | |
1489 | +#line 2111 "configure" | |
1490 | #include "confdefs.h" | |
1491 | #include <alloca.h> | |
1492 | int main() { | |
1493 | char *p = alloca(2 * sizeof(int)); | |
1494 | ; return 0; } | |
1495 | EOF | |
1496 | -if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1497 | +if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1498 | rm -rf conftest* | |
1499 | ac_cv_header_alloca_h=yes | |
1500 | else | |
1501 | @@ -1684,25 +2135,30 @@ | |
1502 | fi | |
1503 | ||
1504 | echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
1505 | -echo "configure:1688: checking for alloca" >&5 | |
1506 | +echo "configure:2139: checking for alloca" >&5 | |
1507 | if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then | |
1508 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1509 | else | |
1510 | cat > conftest.$ac_ext <<EOF | |
1511 | -#line 1693 "configure" | |
1512 | +#line 2144 "configure" | |
1513 | #include "confdefs.h" | |
1514 | ||
1515 | #ifdef __GNUC__ | |
1516 | # define alloca __builtin_alloca | |
1517 | #else | |
1518 | -# if HAVE_ALLOCA_H | |
1519 | -# include <alloca.h> | |
1520 | +# ifdef _MSC_VER | |
1521 | +# include <malloc.h> | |
1522 | +# define alloca _alloca | |
1523 | # else | |
1524 | -# ifdef _AIX | |
1525 | - #pragma alloca | |
1526 | +# if HAVE_ALLOCA_H | |
1527 | +# include <alloca.h> | |
1528 | # else | |
1529 | -# ifndef alloca /* predefined by HP cc +Olibcalls */ | |
1530 | +# ifdef _AIX | |
1531 | + #pragma alloca | |
1532 | +# else | |
1533 | +# ifndef alloca /* predefined by HP cc +Olibcalls */ | |
1534 | char *alloca (); | |
1535 | +# endif | |
1536 | # endif | |
1537 | # endif | |
1538 | # endif | |
1539 | @@ -1712,7 +2168,7 @@ | |
1540 | char *p = (char *) alloca(1); | |
1541 | ; return 0; } | |
1542 | EOF | |
1543 | -if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1544 | +if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1545 | rm -rf conftest* | |
1546 | ac_cv_func_alloca_works=yes | |
1547 | else | |
1548 | @@ -1737,19 +2193,19 @@ | |
1549 | # that cause trouble. Some versions do not even contain alloca or | |
1550 | # contain a buggy version. If you still want to use their alloca, | |
1551 | # use ar to extract alloca.o from them instead of compiling alloca.c. | |
1552 | - ALLOCA=alloca.o | |
1553 | + ALLOCA=alloca.${ac_objext} | |
1554 | cat >> confdefs.h <<\EOF | |
1555 | #define C_ALLOCA 1 | |
1556 | EOF | |
1557 | ||
1558 | ||
1559 | echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
1560 | -echo "configure:1748: checking whether alloca needs Cray hooks" >&5 | |
1561 | +echo "configure:2204: checking whether alloca needs Cray hooks" >&5 | |
1562 | if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then | |
1563 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1564 | else | |
1565 | cat > conftest.$ac_ext <<EOF | |
1566 | -#line 1753 "configure" | |
1567 | +#line 2209 "configure" | |
1568 | #include "confdefs.h" | |
1569 | #if defined(CRAY) && ! defined(CRAY2) | |
1570 | webecray | |
1571 | @@ -1774,12 +2230,12 @@ | |
1572 | if test $ac_cv_os_cray = yes; then | |
1573 | for ac_func in _getb67 GETB67 getb67; do | |
1574 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1575 | -echo "configure:1778: checking for $ac_func" >&5 | |
1576 | +echo "configure:2234: checking for $ac_func" >&5 | |
1577 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1578 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1579 | else | |
1580 | cat > conftest.$ac_ext <<EOF | |
1581 | -#line 1783 "configure" | |
1582 | +#line 2239 "configure" | |
1583 | #include "confdefs.h" | |
1584 | /* System header to define __stub macros and hopefully few prototypes, | |
1585 | which can conflict with char $ac_func(); below. */ | |
1586 | @@ -1802,7 +2258,7 @@ | |
1587 | ||
1588 | ; return 0; } | |
1589 | EOF | |
1590 | -if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1591 | +if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1592 | rm -rf conftest* | |
1593 | eval "ac_cv_func_$ac_func=yes" | |
1594 | else | |
1595 | @@ -1829,7 +2285,7 @@ | |
1596 | fi | |
1597 | ||
1598 | echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
1599 | -echo "configure:1833: checking stack direction for C alloca" >&5 | |
1600 | +echo "configure:2289: checking stack direction for C alloca" >&5 | |
1601 | if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then | |
1602 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1603 | else | |
1604 | @@ -1837,7 +2293,7 @@ | |
1605 | ac_cv_c_stack_direction=0 | |
1606 | else | |
1607 | cat > conftest.$ac_ext <<EOF | |
1608 | -#line 1841 "configure" | |
1609 | +#line 2297 "configure" | |
1610 | #include "confdefs.h" | |
1611 | find_stack_direction () | |
1612 | { | |
1613 | @@ -1856,7 +2312,7 @@ | |
1614 | exit (find_stack_direction() < 0); | |
1615 | } | |
1616 | EOF | |
1617 | -if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null | |
1618 | +if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1619 | then | |
1620 | ac_cv_c_stack_direction=1 | |
1621 | else | |
1622 | @@ -1880,12 +2336,12 @@ | |
1623 | for ac_func in strdup strstr strcasecmp strncasecmp | |
1624 | do | |
1625 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1626 | -echo "configure:1884: checking for $ac_func" >&5 | |
1627 | +echo "configure:2340: checking for $ac_func" >&5 | |
1628 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1629 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1630 | else | |
1631 | cat > conftest.$ac_ext <<EOF | |
1632 | -#line 1889 "configure" | |
1633 | +#line 2345 "configure" | |
1634 | #include "confdefs.h" | |
1635 | /* System header to define __stub macros and hopefully few prototypes, | |
1636 | which can conflict with char $ac_func(); below. */ | |
1637 | @@ -1908,7 +2364,7 @@ | |
1638 | ||
1639 | ; return 0; } | |
1640 | EOF | |
1641 | -if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1642 | +if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1643 | rm -rf conftest* | |
1644 | eval "ac_cv_func_$ac_func=yes" | |
1645 | else | |
1646 | @@ -1935,12 +2391,12 @@ | |
1647 | for ac_func in gettimeofday mktime strptime | |
1648 | do | |
1649 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1650 | -echo "configure:1939: checking for $ac_func" >&5 | |
1651 | +echo "configure:2395: checking for $ac_func" >&5 | |
1652 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1653 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1654 | else | |
1655 | cat > conftest.$ac_ext <<EOF | |
1656 | -#line 1944 "configure" | |
1657 | +#line 2400 "configure" | |
1658 | #include "confdefs.h" | |
1659 | /* System header to define __stub macros and hopefully few prototypes, | |
1660 | which can conflict with char $ac_func(); below. */ | |
1661 | @@ -1963,7 +2419,7 @@ | |
1662 | ||
1663 | ; return 0; } | |
1664 | EOF | |
1665 | -if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1666 | +if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1667 | rm -rf conftest* | |
1668 | eval "ac_cv_func_$ac_func=yes" | |
1669 | else | |
1670 | @@ -1990,12 +2446,12 @@ | |
1671 | for ac_func in strerror vsnprintf select signal symlink access isatty | |
1672 | do | |
1673 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1674 | -echo "configure:1994: checking for $ac_func" >&5 | |
1675 | +echo "configure:2450: checking for $ac_func" >&5 | |
1676 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1677 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1678 | else | |
1679 | cat > conftest.$ac_ext <<EOF | |
1680 | -#line 1999 "configure" | |
1681 | +#line 2455 "configure" | |
1682 | #include "confdefs.h" | |
1683 | /* System header to define __stub macros and hopefully few prototypes, | |
1684 | which can conflict with char $ac_func(); below. */ | |
1685 | @@ -2018,7 +2474,7 @@ | |
1686 | ||
1687 | ; return 0; } | |
1688 | EOF | |
1689 | -if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1690 | +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1691 | rm -rf conftest* | |
1692 | eval "ac_cv_func_$ac_func=yes" | |
1693 | else | |
1694 | @@ -2045,12 +2501,12 @@ | |
1695 | for ac_func in uname gethostname | |
1696 | do | |
1697 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1698 | -echo "configure:2049: checking for $ac_func" >&5 | |
1699 | +echo "configure:2505: checking for $ac_func" >&5 | |
1700 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1701 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1702 | else | |
1703 | cat > conftest.$ac_ext <<EOF | |
1704 | -#line 2054 "configure" | |
1705 | +#line 2510 "configure" | |
1706 | #include "confdefs.h" | |
1707 | /* System header to define __stub macros and hopefully few prototypes, | |
1708 | which can conflict with char $ac_func(); below. */ | |
1709 | @@ -2073,7 +2529,7 @@ | |
1710 | ||
1711 | ; return 0; } | |
1712 | EOF | |
1713 | -if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1714 | +if { (eval echo configure:2533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1715 | rm -rf conftest* | |
1716 | eval "ac_cv_func_$ac_func=yes" | |
1717 | else | |
1718 | @@ -2101,12 +2557,12 @@ | |
1719 | for ac_func in gethostbyname | |
1720 | do | |
1721 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1722 | -echo "configure:2105: checking for $ac_func" >&5 | |
1723 | +echo "configure:2561: checking for $ac_func" >&5 | |
1724 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1725 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1726 | else | |
1727 | cat > conftest.$ac_ext <<EOF | |
1728 | -#line 2110 "configure" | |
1729 | +#line 2566 "configure" | |
1730 | #include "confdefs.h" | |
1731 | /* System header to define __stub macros and hopefully few prototypes, | |
1732 | which can conflict with char $ac_func(); below. */ | |
1733 | @@ -2129,7 +2585,7 @@ | |
1734 | ||
1735 | ; return 0; } | |
1736 | EOF | |
1737 | -if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1738 | +if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1739 | rm -rf conftest* | |
1740 | eval "ac_cv_func_$ac_func=yes" | |
1741 | else | |
1742 | @@ -2151,7 +2607,7 @@ | |
1743 | else | |
1744 | echo "$ac_t""no" 1>&6 | |
1745 | echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 | |
1746 | -echo "configure:2155: checking for gethostbyname in -lnsl" >&5 | |
1747 | +echo "configure:2611: checking for gethostbyname in -lnsl" >&5 | |
1748 | ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` | |
1749 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
1750 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1751 | @@ -2159,7 +2615,7 @@ | |
1752 | ac_save_LIBS="$LIBS" | |
1753 | LIBS="-lnsl $LIBS" | |
1754 | cat > conftest.$ac_ext <<EOF | |
1755 | -#line 2163 "configure" | |
1756 | +#line 2619 "configure" | |
1757 | #include "confdefs.h" | |
1758 | /* Override any gcc2 internal prototype to avoid an error. */ | |
1759 | /* We use char because int might match the return type of a gcc2 | |
1760 | @@ -2170,7 +2626,7 @@ | |
1761 | gethostbyname() | |
1762 | ; return 0; } | |
1763 | EOF | |
1764 | -if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1765 | +if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1766 | rm -rf conftest* | |
1767 | eval "ac_cv_lib_$ac_lib_var=yes" | |
1768 | else | |
1769 | @@ -2204,7 +2660,7 @@ | |
1770 | ||
1771 | ||
1772 | echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 | |
1773 | -echo "configure:2208: checking for socket in -lsocket" >&5 | |
1774 | +echo "configure:2664: checking for socket in -lsocket" >&5 | |
1775 | ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` | |
1776 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
1777 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1778 | @@ -2212,7 +2668,7 @@ | |
1779 | ac_save_LIBS="$LIBS" | |
1780 | LIBS="-lsocket $LIBS" | |
1781 | cat > conftest.$ac_ext <<EOF | |
1782 | -#line 2216 "configure" | |
1783 | +#line 2672 "configure" | |
1784 | #include "confdefs.h" | |
1785 | /* Override any gcc2 internal prototype to avoid an error. */ | |
1786 | /* We use char because int might match the return type of a gcc2 | |
1787 | @@ -2223,7 +2679,7 @@ | |
1788 | socket() | |
1789 | ; return 0; } | |
1790 | EOF | |
1791 | -if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1792 | +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1793 | rm -rf conftest* | |
1794 | eval "ac_cv_lib_$ac_lib_var=yes" | |
1795 | else | |
1796 | @@ -2254,7 +2710,7 @@ | |
1797 | if test "x${with_socks}" = xyes | |
1798 | then | |
1799 | echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6 | |
1800 | -echo "configure:2258: checking for main in -lresolv" >&5 | |
1801 | +echo "configure:2714: checking for main in -lresolv" >&5 | |
1802 | ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'` | |
1803 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
1804 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1805 | @@ -2262,14 +2718,14 @@ | |
1806 | ac_save_LIBS="$LIBS" | |
1807 | LIBS="-lresolv $LIBS" | |
1808 | cat > conftest.$ac_ext <<EOF | |
1809 | -#line 2266 "configure" | |
1810 | +#line 2722 "configure" | |
1811 | #include "confdefs.h" | |
1812 | ||
1813 | int main() { | |
1814 | main() | |
1815 | ; return 0; } | |
1816 | EOF | |
1817 | -if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1818 | +if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1819 | rm -rf conftest* | |
1820 | eval "ac_cv_lib_$ac_lib_var=yes" | |
1821 | else | |
1822 | @@ -2297,7 +2753,7 @@ | |
1823 | fi | |
1824 | ||
1825 | echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6 | |
1826 | -echo "configure:2301: checking for Rconnect in -lsocks" >&5 | |
1827 | +echo "configure:2757: checking for Rconnect in -lsocks" >&5 | |
1828 | ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'` | |
1829 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
1830 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1831 | @@ -2305,7 +2761,7 @@ | |
1832 | ac_save_LIBS="$LIBS" | |
1833 | LIBS="-lsocks $LIBS" | |
1834 | cat > conftest.$ac_ext <<EOF | |
1835 | -#line 2309 "configure" | |
1836 | +#line 2765 "configure" | |
1837 | #include "confdefs.h" | |
1838 | /* Override any gcc2 internal prototype to avoid an error. */ | |
1839 | /* We use char because int might match the return type of a gcc2 | |
1840 | @@ -2316,7 +2772,7 @@ | |
1841 | Rconnect() | |
1842 | ; return 0; } | |
1843 | EOF | |
1844 | -if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1845 | +if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1846 | rm -rf conftest* | |
1847 | eval "ac_cv_lib_$ac_lib_var=yes" | |
1848 | else | |
1849 | @@ -2348,7 +2804,7 @@ | |
1850 | ALL_LINGUAS="cs de hr no it pl pt_BR" | |
1851 | ||
1852 | echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
1853 | -echo "configure:2352: checking whether NLS is requested" >&5 | |
1854 | +echo "configure:2808: checking whether NLS is requested" >&5 | |
1855 | # Check whether --enable-nls or --disable-nls was given. | |
1856 | if test "${enable_nls+set}" = set; then | |
1857 | enableval="$enable_nls" | |
1858 | @@ -2365,7 +2821,7 @@ | |
1859 | # Extract the first word of "msgfmt", so it can be a program name with args. | |
1860 | set dummy msgfmt; ac_word=$2 | |
1861 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1862 | -echo "configure:2369: checking for $ac_word" >&5 | |
1863 | +echo "configure:2825: checking for $ac_word" >&5 | |
1864 | if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then | |
1865 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1866 | else | |
1867 | @@ -2399,7 +2855,7 @@ | |
1868 | # Extract the first word of "xgettext", so it can be a program name with args. | |
1869 | set dummy xgettext; ac_word=$2 | |
1870 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1871 | -echo "configure:2403: checking for $ac_word" >&5 | |
1872 | +echo "configure:2859: checking for $ac_word" >&5 | |
1873 | if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then | |
1874 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1875 | else | |
1876 | @@ -2434,7 +2890,7 @@ | |
1877 | # Extract the first word of "gmsgfmt", so it can be a program name with args. | |
1878 | set dummy gmsgfmt; ac_word=$2 | |
1879 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1880 | -echo "configure:2438: checking for $ac_word" >&5 | |
1881 | +echo "configure:2894: checking for $ac_word" >&5 | |
1882 | if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then | |
1883 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1884 | else | |
1885 | @@ -2442,9 +2898,13 @@ | |
1886 | /*) | |
1887 | ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. | |
1888 | ;; | |
1889 | + ?:/*) | |
1890 | + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. | |
1891 | + ;; | |
1892 | *) | |
1893 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
1894 | - for ac_dir in $PATH; do | |
1895 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
1896 | + ac_dummy="$PATH" | |
1897 | + for ac_dir in $ac_dummy; do | |
1898 | test -z "$ac_dir" && ac_dir=. | |
1899 | if test -f $ac_dir/$ac_word; then | |
1900 | ac_cv_path_GMSGFMT="$ac_dir/$ac_word" | |
1901 | @@ -2480,18 +2940,18 @@ | |
1902 | do | |
1903 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1904 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1905 | -echo "configure:2484: checking for $ac_hdr" >&5 | |
1906 | +echo "configure:2944: checking for $ac_hdr" >&5 | |
1907 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1908 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1909 | else | |
1910 | cat > conftest.$ac_ext <<EOF | |
1911 | -#line 2489 "configure" | |
1912 | +#line 2949 "configure" | |
1913 | #include "confdefs.h" | |
1914 | #include <$ac_hdr> | |
1915 | EOF | |
1916 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1917 | -{ (eval echo configure:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1918 | -ac_err=`grep -v '^ *+' conftest.out` | |
1919 | +{ (eval echo configure:2954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1920 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1921 | if test -z "$ac_err"; then | |
1922 | rm -rf conftest* | |
1923 | eval "ac_cv_header_$ac_safe=yes" | |
1924 | @@ -2520,12 +2980,12 @@ | |
1925 | for ac_func in gettext | |
1926 | do | |
1927 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1928 | -echo "configure:2524: checking for $ac_func" >&5 | |
1929 | +echo "configure:2984: checking for $ac_func" >&5 | |
1930 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1931 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1932 | else | |
1933 | cat > conftest.$ac_ext <<EOF | |
1934 | -#line 2529 "configure" | |
1935 | +#line 2989 "configure" | |
1936 | #include "confdefs.h" | |
1937 | /* System header to define __stub macros and hopefully few prototypes, | |
1938 | which can conflict with char $ac_func(); below. */ | |
1939 | @@ -2548,7 +3008,7 @@ | |
1940 | ||
1941 | ; return 0; } | |
1942 | EOF | |
1943 | -if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1944 | +if { (eval echo configure:3012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1945 | rm -rf conftest* | |
1946 | eval "ac_cv_func_$ac_func=yes" | |
1947 | else | |
1948 | @@ -2570,7 +3030,7 @@ | |
1949 | else | |
1950 | echo "$ac_t""no" 1>&6 | |
1951 | echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 | |
1952 | -echo "configure:2574: checking for gettext in -lintl" >&5 | |
1953 | +echo "configure:3034: checking for gettext in -lintl" >&5 | |
1954 | ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` | |
1955 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
1956 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1957 | @@ -2578,7 +3038,7 @@ | |
1958 | ac_save_LIBS="$LIBS" | |
1959 | LIBS="-lintl $LIBS" | |
1960 | cat > conftest.$ac_ext <<EOF | |
1961 | -#line 2582 "configure" | |
1962 | +#line 3042 "configure" | |
1963 | #include "confdefs.h" | |
1964 | /* Override any gcc2 internal prototype to avoid an error. */ | |
1965 | /* We use char because int might match the return type of a gcc2 | |
1966 | @@ -2589,7 +3049,7 @@ | |
1967 | gettext() | |
1968 | ; return 0; } | |
1969 | EOF | |
1970 | -if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then | |
1971 | +if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1972 | rm -rf conftest* | |
1973 | eval "ac_cv_lib_$ac_lib_var=yes" | |
1974 | else | |
1975 | @@ -2657,15 +3117,16 @@ | |
1976 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
1977 | set dummy $ac_prog; ac_word=$2 | |
1978 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1979 | -echo "configure:2661: checking for $ac_word" >&5 | |
1980 | +echo "configure:3121: checking for $ac_word" >&5 | |
1981 | if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then | |
1982 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1983 | else | |
1984 | if test -n "$MAKEINFO"; then | |
1985 | ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. | |
1986 | else | |
1987 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" | |
1988 | - for ac_dir in $PATH; do | |
1989 | + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" | |
1990 | + ac_dummy="$PATH" | |
1991 | + for ac_dir in $ac_dummy; do | |
1992 | test -z "$ac_dir" && ac_dir=. | |
1993 | if test -f $ac_dir/$ac_word; then | |
1994 | ac_cv_prog_MAKEINFO="$ac_prog" | |
1995 | @@ -2715,7 +3176,7 @@ | |
1996 | # Ultrix sh set writes to stderr and can't be redirected directly, | |
1997 | # and sets the high bit in the cache file unless we assign to the vars. | |
1998 | (set) 2>&1 | | |
1999 | - case `(ac_space=' '; set) 2>&1` in | |
2000 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in | |
2001 | *ac_space=\ *) | |
2002 | # `set' does not quote correctly, so add quotes (double-quote substitution | |
2003 | # turns \\\\ into \\, and sed turns \\ into \). | |
2004 | @@ -2782,7 +3243,7 @@ | |
2005 | echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" | |
2006 | exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; | |
2007 | -version | --version | --versio | --versi | --vers | --ver | --ve | --v) | |
2008 | - echo "$CONFIG_STATUS generated by autoconf version 2.12" | |
2009 | + echo "$CONFIG_STATUS generated by autoconf version 2.13" | |
2010 | exit 0 ;; | |
2011 | -help | --help | --hel | --he | --h) | |
2012 | echo "\$ac_cs_usage"; exit 0 ;; | |
2013 | @@ -2802,9 +3263,11 @@ | |
2014 | s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF | |
2015 | $ac_vpsub | |
2016 | $extrasub | |
2017 | +s%@SHELL@%$SHELL%g | |
2018 | s%@CFLAGS@%$CFLAGS%g | |
2019 | s%@CPPFLAGS@%$CPPFLAGS%g | |
2020 | s%@CXXFLAGS@%$CXXFLAGS%g | |
2021 | +s%@FFLAGS@%$FFLAGS%g | |
2022 | s%@DEFS@%$DEFS%g | |
2023 | s%@LDFLAGS@%$LDFLAGS%g | |
2024 | s%@LIBS@%$LIBS%g | |
2025 | @@ -2825,18 +3288,20 @@ | |
2026 | s%@mandir@%$mandir%g | |
2027 | s%@VERSION@%$VERSION%g | |
2028 | s%@PACKAGE@%$PACKAGE%g | |
2029 | +s%@CC@%$CC%g | |
2030 | +s%@CPP@%$CPP%g | |
2031 | s%@host@%$host%g | |
2032 | s%@host_alias@%$host_alias%g | |
2033 | s%@host_cpu@%$host_cpu%g | |
2034 | s%@host_vendor@%$host_vendor%g | |
2035 | s%@host_os@%$host_os%g | |
2036 | +s%@LIBOBJS@%$LIBOBJS%g | |
2037 | s%@MD5_OBJ@%$MD5_OBJ%g | |
2038 | s%@OPIE_OBJ@%$OPIE_OBJ%g | |
2039 | s%@SET_MAKE@%$SET_MAKE%g | |
2040 | s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g | |
2041 | +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g | |
2042 | s%@INSTALL_DATA@%$INSTALL_DATA%g | |
2043 | -s%@CC@%$CC%g | |
2044 | -s%@CPP@%$CPP%g | |
2045 | s%@exeext@%$exeext%g | |
2046 | s%@U@%$U%g | |
2047 | s%@ANSI2KNR@%$ANSI2KNR%g | |
2048 | diff -urN wget-1.5.3.orig/configure.in wget-1.5.3/configure.in | |
2049 | --- wget-1.5.3.orig/configure.in Sat May 22 13:25:03 1999 | |
2050 | +++ wget-1.5.3/configure.in Sat May 22 13:31:36 1999 | |
2051 | @@ -32,12 +32,243 @@ | |
2052 | PACKAGE=wget | |
2053 | AC_SUBST(PACKAGE) | |
2054 | ||
2055 | +AC_PROG_CC | |
2056 | + | |
2057 | +dnl | |
2058 | +dnl Handle AIX | |
2059 | +dnl | |
2060 | +AC_AIX | |
2061 | + | |
2062 | dnl | |
2063 | dnl Get cannonical host | |
2064 | dnl | |
2065 | AC_CANONICAL_HOST | |
2066 | AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os") | |
2067 | ||
2068 | +AC_MSG_CHECKING([whether to enable ipv6]) | |
2069 | +AC_ARG_ENABLE(ipv6, | |
2070 | +[ --enable-ipv6 Enable ipv6 (with ipv4) support | |
2071 | + --disable-ipv6 Disable ipv6 support], | |
2072 | +[ case "$enableval" in | |
2073 | + no) | |
2074 | + AC_MSG_RESULT(no) | |
2075 | + ipv6=no | |
2076 | + ;; | |
2077 | + *) AC_MSG_RESULT(yes) | |
2078 | + AC_DEFINE(ENABLE_IPV6) | |
2079 | + ipv6=yes | |
2080 | + ;; | |
2081 | + esac ], | |
2082 | + | |
2083 | + AC_TRY_RUN([ /* AF_INET6 avalable check */ | |
2084 | +#include <sys/types.h> | |
2085 | +#include <sys/socket.h> | |
2086 | +main() | |
2087 | +{ | |
2088 | + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) | |
2089 | + exit(1); | |
2090 | + else | |
2091 | + exit(0); | |
2092 | +} | |
2093 | +], | |
2094 | + AC_MSG_RESULT(yes) | |
2095 | + AC_DEFINE(ENABLE_IPV6) | |
2096 | + ipv6=yes, | |
2097 | + AC_MSG_RESULT(no) | |
2098 | + ipv6=no, | |
2099 | + AC_MSG_RESULT(no) | |
2100 | + ipv6=no | |
2101 | +)) | |
2102 | + | |
2103 | +ipv6type=unknown | |
2104 | +ipv6lib=none | |
2105 | + | |
2106 | +if test "$ipv6" = "yes"; then | |
2107 | + AC_MSG_CHECKING([ipv6 stack type]) | |
2108 | + for i in inria kame linux toshiba v6d zeta; do | |
2109 | + case $i in | |
2110 | + inria) | |
2111 | + dnl http://www.kame.net/ | |
2112 | + AC_EGREP_CPP(yes, [dnl | |
2113 | +#include <netinet/in.h> | |
2114 | +#ifdef IPV6_INRIA_VERSION | |
2115 | +yes | |
2116 | +#endif], | |
2117 | + [ipv6type=$i; | |
2118 | + CFLAGS="-DINET6 $CFLAGS"]) | |
2119 | + ;; | |
2120 | + kame) | |
2121 | + dnl http://www.kame.net/ | |
2122 | + AC_EGREP_CPP(yes, [dnl | |
2123 | +#include <netinet/in.h> | |
2124 | +#ifdef __KAME__ | |
2125 | +yes | |
2126 | +#endif], | |
2127 | + [ipv6type=$i; | |
2128 | + ipv6lib=inet6; | |
2129 | + ipv6libdir=/usr/local/v6/lib; | |
2130 | + CFLAGS="-DINET6 $CFLAGS"]) | |
2131 | + ;; | |
2132 | + linux) | |
2133 | + dnl http://www.v6.linux.or.jp/ | |
2134 | + if test -d /usr/inet6; then | |
2135 | + ipv6type=$i | |
2136 | + ipv6lib=inet6 | |
2137 | + ipv6libdir=/usr/inet6/lib | |
2138 | + CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS" | |
2139 | + fi | |
2140 | + ;; | |
2141 | + toshiba) | |
2142 | + AC_EGREP_CPP(yes, [dnl | |
2143 | +#include <sys/param.h> | |
2144 | +#ifdef _TOSHIBA_INET6 | |
2145 | +yes | |
2146 | +#endif], | |
2147 | + [ipv6type=$i; | |
2148 | + ipv6lib=inet6; | |
2149 | + ipv6libdir=/usr/local/v6/lib; | |
2150 | + CFLAGS="-DINET6 $CFLAGS"]) | |
2151 | + ;; | |
2152 | + v6d) | |
2153 | + AC_EGREP_CPP(yes, [dnl | |
2154 | +#include </usr/local/v6/include/sys/v6config.h> | |
2155 | +#ifdef __V6D__ | |
2156 | +yes | |
2157 | +#endif], | |
2158 | + [ipv6type=$i; | |
2159 | + ipv6lib=v6; | |
2160 | + ipv6libdir=/usr/local/v6/lib; | |
2161 | + CFLAGS="-I/usr/local/v6/include $CFLAGS"]) | |
2162 | + ;; | |
2163 | + zeta) | |
2164 | + AC_EGREP_CPP(yes, [dnl | |
2165 | +#include <sys/param.h> | |
2166 | +#ifdef _ZETA_MINAMI_INET6 | |
2167 | +yes | |
2168 | +#endif], | |
2169 | + [ipv6type=$i; | |
2170 | + ipv6lib=inet6; | |
2171 | + ipv6libdir=/usr/local/v6/lib; | |
2172 | + CFLAGS="-DINET6 $CFLAGS"]) | |
2173 | + ;; | |
2174 | + esac | |
2175 | + if test "$ipv6type" != "unknown"; then | |
2176 | + break | |
2177 | + fi | |
2178 | + done | |
2179 | + AC_MSG_RESULT($ipv6type) | |
2180 | +fi | |
2181 | + | |
2182 | +if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then | |
2183 | + if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then | |
2184 | + LIBS="-L$ipv6libdir -l$ipv6lib $LIBS" | |
2185 | + else | |
2186 | + echo 'Fatal: no $ipv6lib library found. cannot continue.' | |
2187 | + echo "You need to fetch lib$ipv6lib.a from appropriate" | |
2188 | + echo 'ipv6 kit and compile beforehand.' | |
2189 | + exit 1 | |
2190 | + fi | |
2191 | +fi | |
2192 | + | |
2193 | +AC_MSG_CHECKING(getaddrinfo bug) | |
2194 | +AC_TRY_RUN([ | |
2195 | +#include <sys/types.h> | |
2196 | +#include <netdb.h> | |
2197 | +#include <string.h> | |
2198 | +#include <sys/socket.h> | |
2199 | +#include <netinet/in.h> | |
2200 | + | |
2201 | +main() | |
2202 | +{ | |
2203 | + int passive, gaierr, inet4 = 0, inet6 = 0; | |
2204 | + struct addrinfo hints, *ai, *aitop; | |
2205 | + char straddr[INET6_ADDRSTRLEN], strport[16]; | |
2206 | + | |
2207 | + for (passive = 0; passive <= 1; passive++) { | |
2208 | + memset(&hints, 0, sizeof(hints)); | |
2209 | + hints.ai_family = AF_UNSPEC; | |
2210 | + hints.ai_flags = passive ? AI_PASSIVE : 0; | |
2211 | + hints.ai_socktype = SOCK_STREAM; | |
2212 | + if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) { | |
2213 | + (void)gai_strerror(gaierr); | |
2214 | + goto bad; | |
2215 | + } | |
2216 | + for (ai = aitop; ai; ai = ai->ai_next) { | |
2217 | + if (ai->ai_addr == NULL || | |
2218 | + ai->ai_addrlen == 0 || | |
2219 | + getnameinfo(ai->ai_addr, ai->ai_addrlen, | |
2220 | + straddr, sizeof(straddr), strport, sizeof(strport), | |
2221 | + NI_NUMERICHOST|NI_NUMERICSERV) != 0) { | |
2222 | + goto bad; | |
2223 | + } | |
2224 | + if (strcmp(strport, "54321") != 0) { | |
2225 | + goto bad; | |
2226 | + } | |
2227 | + switch (ai->ai_family) { | |
2228 | + case AF_INET: | |
2229 | + if (passive) { | |
2230 | + if (strcmp(straddr, "0.0.0.0") != 0) { | |
2231 | + goto bad; | |
2232 | + } | |
2233 | + } else { | |
2234 | + if (strcmp(straddr, "127.0.0.1") != 0) { | |
2235 | + goto bad; | |
2236 | + } | |
2237 | + } | |
2238 | + inet4++; | |
2239 | + break; | |
2240 | + case AF_INET6: | |
2241 | + if (passive) { | |
2242 | + if (strcmp(straddr, "::") != 0) { | |
2243 | + goto bad; | |
2244 | + } | |
2245 | + } else { | |
2246 | + if (strcmp(straddr, "::1") != 0) { | |
2247 | + goto bad; | |
2248 | + } | |
2249 | + } | |
2250 | + inet6++; | |
2251 | + break; | |
2252 | + case AF_UNSPEC: | |
2253 | + goto bad; | |
2254 | + break; | |
2255 | + default: | |
2256 | + /* another family support? */ | |
2257 | + break; | |
2258 | + } | |
2259 | + } | |
2260 | + } | |
2261 | + | |
2262 | + if (inet6 != 2 || inet4 != 2) | |
2263 | + goto bad; | |
2264 | + | |
2265 | + if (aitop) | |
2266 | + freeaddrinfo(aitop); | |
2267 | + exit(0); | |
2268 | + | |
2269 | + bad: | |
2270 | + if (aitop) | |
2271 | + freeaddrinfo(aitop); | |
2272 | + exit(1); | |
2273 | +} | |
2274 | +], | |
2275 | +AC_MSG_RESULT(good) | |
2276 | +buggygetaddrinfo=no, | |
2277 | +AC_MSG_RESULT(buggy) | |
2278 | +buggygetaddrinfo=yes, | |
2279 | +AC_MSG_RESULT(buggy) | |
2280 | +buggygetaddrinfo=yes) | |
2281 | + | |
2282 | +if test "$buggygetaddrinfo" = "yes"; then | |
2283 | + if test "$ipv6" = "yes"; then | |
2284 | + echo 'Fatal: You must get working getaddrinfo() function.' | |
2285 | + echo ' or you can specify "--disable-ipv6"'. | |
2286 | + exit 1 | |
2287 | + else | |
2288 | + AC_REPLACE_FUNCS(getaddrinfo getnameinfo) | |
2289 | + fi | |
2290 | +fi | |
2291 | + | |
2292 | dnl | |
2293 | dnl Process features. | |
2294 | dnl | |
2295 | @@ -88,8 +319,6 @@ | |
2296 | test -z "$CFLAGS" && CFLAGS= auto_cflags=1 | |
2297 | test -z "$CC" && cc_specified=yes | |
2298 | ||
2299 | -AC_PROG_CC | |
2300 | - | |
2301 | dnl | |
2302 | dnl if the user hasn't specified CFLAGS, then | |
2303 | dnl if compiler is gcc, then use -O2 and some warning flags | |
2304 | @@ -106,11 +335,6 @@ | |
2305 | esac | |
2306 | fi | |
2307 | fi | |
2308 | - | |
2309 | -dnl | |
2310 | -dnl Handle AIX | |
2311 | -dnl | |
2312 | -AC_AIX | |
2313 | ||
2314 | dnl | |
2315 | dnl In case of {cyg,gnu}win32. Should be a _target_ test. | |
2316 | diff -urN wget-1.5.3.orig/doc/Makefile.in~ wget-1.5.3/doc/Makefile.in~ | |
2317 | --- wget-1.5.3.orig/doc/Makefile.in~ Sat May 22 13:25:03 1999 | |
2318 | +++ wget-1.5.3/doc/Makefile.in~ Thu Jan 1 01:00:00 1970 | |
2319 | @@ -1,145 +0,0 @@ | |
2320 | -# Makefile for `wget' utility | |
2321 | -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. | |
2322 | - | |
2323 | -# This program is free software; you can redistribute it and/or modify | |
2324 | -# it under the terms of the GNU General Public License as published by | |
2325 | -# the Free Software Foundation; either version 2 of the License, or | |
2326 | -# (at your option) any later version. | |
2327 | - | |
2328 | -# This program is distributed in the hope that it will be useful, | |
2329 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of | |
2330 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
2331 | -# GNU General Public License for more details. | |
2332 | - | |
2333 | -# You should have received a copy of the GNU General Public License | |
2334 | -# along with this program; if not, write to the Free Software | |
2335 | -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
2336 | - | |
2337 | -# | |
2338 | -# Version: @VERSION@ | |
2339 | -# | |
2340 | - | |
2341 | -SHELL = /bin/sh | |
2342 | - | |
2343 | -# Program to format Texinfo source into Info files. | |
2344 | -MAKEINFO = @MAKEINFO@ | |
2345 | -# Program to format Texinfo source into DVI files. | |
2346 | -TEXI2DVI = texi2dvi | |
2347 | -# Program to convert DVI files to PostScript | |
2348 | -DVIPS = dvips -D 300 | |
2349 | -# Program to convert texinfo files to html | |
2350 | -TEXI2HTML = texi2html -expandinfo -split_chapter | |
2351 | - | |
2352 | -top_srcdir = @top_srcdir@ | |
2353 | -srcdir = @srcdir@ | |
2354 | -VPATH = @srcdir@ | |
2355 | - | |
2356 | -prefix = @prefix@ | |
2357 | -infodir = @infodir@ | |
2358 | -mandir = @mandir@ | |
2359 | -manext = 1 | |
2360 | -sysconfdir = @sysconfdir@ | |
2361 | - | |
2362 | -INSTALL = @INSTALL@ | |
2363 | -INSTALL_DATA = @INSTALL_DATA@ | |
2364 | -RM = rm -f | |
2365 | - | |
2366 | -MAN = wget.$(manext) | |
2367 | -WGETRC = $(sysconfdir)/wgetrc | |
2368 | - | |
2369 | -# | |
2370 | -# Dependencies for building | |
2371 | -# | |
2372 | - | |
2373 | -all: wget.info # wget.cat | |
2374 | - | |
2375 | -everything: all wget_us.ps wget_a4.ps wget_toc.html | |
2376 | - | |
2377 | -wget.info: wget.texi | |
2378 | - -$(MAKEINFO) | |
2379 | - | |
2380 | -#wget.cat: $(MAN) | |
2381 | -# nroff -man $(srcdir)/$(MAN) > wget.cat | |
2382 | - | |
2383 | -dvi: wget.dvi | |
2384 | - | |
2385 | -wget.dvi: wget.texi | |
2386 | - $(TEXI2DVI) $(srcdir)/wget.texi | |
2387 | - | |
2388 | -wget_us.ps: wget.dvi | |
2389 | - $(DVIPS) -t letter -o $@ wget.dvi | |
2390 | - | |
2391 | -wget_a4.ps: wget.dvi | |
2392 | - $(DVIPS) -t a4 -o $@ wget.dvi | |
2393 | - | |
2394 | -wget_toc.html: wget.texi | |
2395 | - $(TEXI2HTML) $(srcdir)/wget.texi | |
2396 | - | |
2397 | -# | |
2398 | -# Dependencies for installing | |
2399 | -# | |
2400 | - | |
2401 | -# install all the documentation | |
2402 | -install: install.info install.wgetrc # install.man | |
2403 | - | |
2404 | -# uninstall all the documentation | |
2405 | -uninstall: uninstall.info # uninstall.man | |
2406 | - | |
2407 | -# install info pages, creating install directory if necessary | |
2408 | -install.info: wget.info | |
2409 | - $(top_srcdir)/mkinstalldirs $(infodir) | |
2410 | - -for file in $(srcdir)/wget.info $(srcdir)/wget.info-*[0-9]; do \ | |
2411 | - test -f "$$file" && $(INSTALL_DATA) $$file $(infodir) ; \ | |
2412 | - done | |
2413 | - | |
2414 | -# install man page, creating install directory if necessary | |
2415 | -#install.man: | |
2416 | -# $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext) | |
2417 | -# $(INSTALL_DATA) $(srcdir)/$(MAN) $(mandir)/man$(manext)/$(MAN) | |
2418 | - | |
2419 | -# install sample.wgetrc | |
2420 | -install.wgetrc: | |
2421 | - $(top_srcdir)/mkinstalldirs $(sysconfdir) | |
2422 | - @if test -f $(WGETRC); then \ | |
2423 | - if cmp -s $(srcdir)/sample.wgetrc $(WGETRC); then echo ""; \ | |
2424 | - else \ | |
2425 | - echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \ | |
2426 | - $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \ | |
2427 | - echo "WARNING: File \`$(WGETRC)' already exists and is spared."; \ | |
2428 | - echo " You might want to consider \`$(WGETRC).new',"; \ | |
2429 | - echo " and merge both into \`$(WGETRC)', for the best."; \ | |
2430 | - fi; \ | |
2431 | - else \ | |
2432 | - $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \ | |
2433 | - fi | |
2434 | - | |
2435 | -# uninstall info pages | |
2436 | -uninstall.info: | |
2437 | - $(RM) $(infodir)/wget.info* | |
2438 | - | |
2439 | -# uninstall man page | |
2440 | -#uninstall.man: | |
2441 | -# $(RM) $(mandir)/man$(manext)/$(MAN) | |
2442 | - | |
2443 | -# | |
2444 | -# Dependencies for cleanup | |
2445 | -# | |
2446 | - | |
2447 | -clean: | |
2448 | - $(RM) *~ *.bak *.cat *.html | |
2449 | - $(RM) *.dvi *.aux *.cp *.cps *.fn *.toc *.tp *.vr *.ps *.ky *.pg *.log | |
2450 | - | |
2451 | -distclean: clean | |
2452 | - $(RM) Makefile | |
2453 | - | |
2454 | -realclean: distclean | |
2455 | - $(RM) wget.info* | |
2456 | - | |
2457 | -# | |
2458 | -# Dependencies for maintenance | |
2459 | -# | |
2460 | - | |
2461 | -subdir = doc | |
2462 | - | |
2463 | -Makefile: Makefile.in ../config.status | |
2464 | - cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status | |
2465 | diff -urN wget-1.5.3.orig/src/connect.c wget-1.5.3/src/connect.c | |
2466 | --- wget-1.5.3.orig/src/connect.c Sat May 22 13:25:03 1999 | |
2467 | +++ wget-1.5.3/src/connect.c Sat May 22 13:31:40 1999 | |
2468 | @@ -62,6 +62,59 @@ | |
2469 | uerr_t | |
2470 | make_connection (int *sock, char *hostname, unsigned short port) | |
2471 | { | |
2472 | +#ifdef INET6 | |
2473 | + struct sockaddr_storage sock_name; | |
2474 | + struct sockaddr_in *sin; | |
2475 | + struct sockaddr_in6 *sin6; | |
2476 | + size_t socksize; | |
2477 | + | |
2478 | + /* | |
2479 | + * Get internet address of the host. We can do it either by calling | |
2480 | + * ngethostbyname, or by calling store_hostaddress, from host.c. | |
2481 | + * storehostaddress is better since it caches calls to | |
2482 | + * gethostbyname. | |
2483 | + */ | |
2484 | + if (!store_hostaddress (&sock_name, hostname)) | |
2485 | + return HOSTERR; | |
2486 | + | |
2487 | + /* Set port and protocol */ | |
2488 | + switch (sock_name.__ss_family) { | |
2489 | + case AF_INET: | |
2490 | + sin = (struct sockaddr_in *) &sock_name; | |
2491 | + sin->sin_family = AF_INET; | |
2492 | +#ifdef HAVE_SOCKADDR_SA_LEN | |
2493 | + sin->sin_len = sizeof (struct sockaddr_in); | |
2494 | +#endif | |
2495 | + sin->sin_port = htons (port); | |
2496 | + socksize = sizeof (struct sockaddr_in); | |
2497 | + break; | |
2498 | + case AF_INET6: | |
2499 | + sin6 = (struct sockaddr_in6 *) &sock_name; | |
2500 | + sin6->sin6_family = AF_INET6; | |
2501 | +#ifdef HAVE_SOCKADDR_SA_LEN | |
2502 | + sin6->sin6_len = sizeof (struct sockaddr_in6); | |
2503 | +#endif | |
2504 | + sin6->sin6_port = htons (port); | |
2505 | + socksize = sizeof (struct sockaddr_in6); | |
2506 | + break; | |
2507 | + default: | |
2508 | + return HOSTERR; | |
2509 | + } | |
2510 | + /* Make an internet socket, stream type. */ | |
2511 | + if ((*sock = socket (sock_name.__ss_family, SOCK_STREAM, 0)) == -1) | |
2512 | + return CONSOCKERR; | |
2513 | + | |
2514 | + /* Connect the socket to the remote host. */ | |
2515 | + if (connect (*sock, (struct sockaddr *) &sock_name, socksize)) | |
2516 | + { | |
2517 | + if (errno == ECONNREFUSED) | |
2518 | + return CONREFUSED; | |
2519 | + else | |
2520 | + return CONERROR; | |
2521 | + } | |
2522 | + DEBUGP (("Created fd %d.\n", *sock)); | |
2523 | + return NOCONERROR; | |
2524 | +#else /* !INET6 */ | |
2525 | struct sockaddr_in sock_name; | |
2526 | /* struct hostent *hptr; */ | |
2527 | ||
2528 | @@ -97,6 +150,7 @@ | |
2529 | } | |
2530 | DEBUGP (("Created fd %d.\n", *sock)); | |
2531 | return NOCONERROR; | |
2532 | +#endif /* INET6 */ | |
2533 | } | |
2534 | ||
2535 | /* Bind the local port PORT. This does all the necessary work, which | |
2536 | diff -urN wget-1.5.3.orig/src/host.c wget-1.5.3/src/host.c | |
2537 | --- wget-1.5.3.orig/src/host.c Sat May 22 13:25:03 1999 | |
2538 | +++ wget-1.5.3/src/host.c Sat May 22 13:31:50 1999 | |
2539 | @@ -75,12 +75,58 @@ | |
2540 | static struct host *add_hlist PARAMS ((struct host *, const char *, | |
2541 | const char *, int)); | |
2542 | ||
2543 | +#ifdef INET6 | |
2544 | +/* | |
2545 | + * The same as gethostbyname2, but supports internet addresses of the | |
2546 | + * form `N.N.N.N' and 'X:X:X:X:X:X:X:X'. | |
2547 | + * | |
2548 | + * Return the pointer of struct hostent on successful finding of the | |
2549 | + * hostname, NULL pointer otherwise. | |
2550 | + */ | |
2551 | +struct hostent * | |
2552 | +ngethostbyname2 (const char *name, int af) | |
2553 | +{ | |
2554 | + struct hostent *hp = (struct hostent *) NULL; | |
2555 | + char *addr; | |
2556 | + size_t socksize; | |
2557 | + | |
2558 | + /* Support only 2 types address family */ | |
2559 | + if (af != AF_INET6 && af != AF_INET) | |
2560 | + return (struct hostent *) NULL; | |
2561 | + | |
2562 | + hp = gethostbyname2(name, af); | |
2563 | + if (!hp) { | |
2564 | + if (inet_pton(af, name, addr) != -1) { | |
2565 | + switch (af) { | |
2566 | + case AF_INET: | |
2567 | + socksize = sizeof (struct sockaddr_in); | |
2568 | + break; | |
2569 | + case AF_INET6: | |
2570 | + socksize = sizeof (struct sockaddr_in6); | |
2571 | + break; | |
2572 | + } | |
2573 | + hp = gethostbyaddr(addr, socksize, af); | |
2574 | + } | |
2575 | + } | |
2576 | + return hp; | |
2577 | +} | |
2578 | +#endif /* INET6 */ | |
2579 | + | |
2580 | /* The same as gethostbyname, but supports internet addresses of the | |
2581 | form `N.N.N.N'. */ | |
2582 | struct hostent * | |
2583 | ngethostbyname (const char *name) | |
2584 | { | |
2585 | struct hostent *hp; | |
2586 | +#ifdef INET6 | |
2587 | + const int af[] = { AF_INET, AF_INET6 }; | |
2588 | + int i; | |
2589 | + | |
2590 | + for (i = 0; i < 2; i++) | |
2591 | + if ((hp = ngethostbyname2(name, af[i])) != NULL) | |
2592 | + return hp; | |
2593 | + return (struct hostent *) NULL; | |
2594 | +#else | |
2595 | unsigned long addr; | |
2596 | ||
2597 | addr = (unsigned long)inet_addr (name); | |
2598 | @@ -89,6 +135,7 @@ | |
2599 | else | |
2600 | hp = gethostbyname (name); | |
2601 | return hp; | |
2602 | +#endif | |
2603 | } | |
2604 | ||
2605 | /* Search for HOST in the linked list L, by hostname. Return the | |
2606 | @@ -117,11 +164,159 @@ | |
2607 | return NULL; | |
2608 | } | |
2609 | ||
2610 | -/* Store the address of HOSTNAME, internet-style, to WHERE. First | |
2611 | - check for it in the host list, and (if not found), use | |
2612 | - ngethostbyname to get it. | |
2613 | +#ifdef INET6 | |
2614 | +int | |
2615 | +convert_hostaddress(int af, const char *hostname, void *address) | |
2616 | +{ | |
2617 | + struct host *t; | |
2618 | + int valid; | |
2619 | + | |
2620 | + valid = inet_pton(af, hostname, address); | |
2621 | + if (valid == -1 || valid == 0) { | |
2622 | + /* If it is not of that form, try to find it in the cache. */ | |
2623 | + t = search_host (hlist, hostname); | |
2624 | + if (t) | |
2625 | + valid = inet_pton(af, t->realname, address); | |
2626 | + if (valid != -1 && valid != 0) | |
2627 | + return 1; | |
2628 | + } else | |
2629 | + return 1; | |
2630 | + return 0; | |
2631 | +} | |
2632 | + | |
2633 | +/* | |
2634 | + * Store the address of HOSTNAME, internet-style, to WHERE. First | |
2635 | + * check for it in the host list, and (if not found), use | |
2636 | + * ngethostbyname to get it. | |
2637 | + * | |
2638 | + * Return 1 on successful finding of the hostname, 0 otherwise. | |
2639 | + */ | |
2640 | +int | |
2641 | +store_hostaddress (struct sockaddr_storage *where, const char *hostname) | |
2642 | +{ | |
2643 | + struct host *t; | |
2644 | + struct addrinfo hints, *res; | |
2645 | + union { | |
2646 | + struct in_addr in; | |
2647 | + struct in6_addr in6; | |
2648 | + } addr_un; | |
2649 | + struct sockaddr_in *sin; | |
2650 | + struct sockaddr_in6 *sin6; | |
2651 | + char *addr_s; | |
2652 | + char addr_st[INET6_ADDRSTRLEN]; | |
2653 | + int af, valid ,i, err; | |
2654 | + int family; | |
2655 | + const int afs[] = { AF_INET6, AF_INET }; | |
2656 | +#define MAX_AF 2 | |
2657 | ||
2658 | - Return 1 on successful finding of the hostname, 0 otherwise. */ | |
2659 | + if (opt.inet) | |
2660 | + family = AF_INET; | |
2661 | + else if (opt.inet6) | |
2662 | + family = AF_INET6; | |
2663 | + else | |
2664 | + family = 0; | |
2665 | + /* | |
2666 | + * If the address is of the form d.d.d.d, there will be no trouble | |
2667 | + * with it. | |
2668 | + */ | |
2669 | + if (!family) { | |
2670 | + for (i = 0; i < MAX_AF; i++) { | |
2671 | + valid = convert_hostaddress(afs[i], hostname, &addr_un); | |
2672 | + af = afs[i]; | |
2673 | + } | |
2674 | + } else { | |
2675 | + valid = convert_hostaddress(family, hostname, &addr_un); | |
2676 | + af = family; | |
2677 | + } | |
2678 | + /* If we have the numeric address, just store it. */ | |
2679 | + if (valid) { | |
2680 | + /* This works on both little and big endian architecture, as | |
2681 | + * inet_addr returns the address in the proper order. It | |
2682 | + * appears to work on 64-bit machines too. | |
2683 | + */ | |
2684 | + switch (af) { | |
2685 | + case AF_INET: | |
2686 | + sin = (struct sockaddr_in *) where; | |
2687 | + memcpy(&sin->sin_addr, &addr_un.in, sizeof(struct in_addr)); | |
2688 | + sin->sin_family = AF_INET; | |
2689 | + return 1; | |
2690 | + case AF_INET6: | |
2691 | + sin6 = (struct sockaddr_in6 *) where; | |
2692 | + memcpy(&sin6->sin6_addr, &addr_un.in6, sizeof(struct in6_addr)); | |
2693 | + sin6->sin6_family = AF_INET6; | |
2694 | + return 1; | |
2695 | + default: | |
2696 | + return 0; | |
2697 | + } | |
2698 | + } | |
2699 | + /* | |
2700 | + * Since all else has failed, let's try gethostbyname2(). Note that | |
2701 | + * we use gethostbyname2() rather than ngethostbyname2(), because we | |
2702 | + * *know* the address is not numerical. | |
2703 | + */ | |
2704 | + bzero(&hints, sizeof(hints)); | |
2705 | + hints.ai_socktype = SOCK_STREAM; | |
2706 | + hints.ai_protocol = 0; | |
2707 | + if (!family) { | |
2708 | + hints.ai_family = AF_UNSPEC; | |
2709 | + } else { | |
2710 | + hints.ai_family = family; | |
2711 | + } | |
2712 | + err = getaddrinfo(hostname, NULL, &hints, &res); | |
2713 | + if (err) { | |
2714 | + fprintf(stderr, "%s: %s\n", hostname, gai_strerror(err)); | |
2715 | + return 0; | |
2716 | + } | |
2717 | + /* | |
2718 | + * Copy the address of the host to socket description. | |
2719 | + */ | |
2720 | + switch (res->ai_family) { | |
2721 | + case AF_INET: | |
2722 | + sin = (struct sockaddr_in *) where; | |
2723 | + memcpy(&sin->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof (struct in_addr)); | |
2724 | + sin->sin_family = AF_INET; | |
2725 | + memcpy (&addr_un.in.s_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof (addr_un.in)); | |
2726 | + inet_ntop(AF_INET, &addr_un.in, addr_st, sizeof (struct in_addr)); | |
2727 | + STRDUP_ALLOCA (addr_s, addr_st); | |
2728 | + freeaddrinfo(res); | |
2729 | + break; | |
2730 | + case AF_INET6: | |
2731 | + sin6 = (struct sockaddr_in6 *) where; | |
2732 | + memcpy(&sin6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, sizeof (struct in6_addr)); | |
2733 | + sin6->sin6_family = AF_INET6; | |
2734 | + memcpy (&addr_un.in6, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, sizeof (addr_un.in6)); | |
2735 | + inet_ntop(AF_INET6, &addr_un.in6, addr_st, sizeof (struct in6_addr)); | |
2736 | + STRDUP_ALLOCA (addr_s, addr_st); | |
2737 | + freeaddrinfo(res); | |
2738 | + break; | |
2739 | + default: | |
2740 | + freeaddrinfo(res); | |
2741 | + return 0; | |
2742 | + } | |
2743 | + /* | |
2744 | + * Now that we're here, we could as well cache the hostname for | |
2745 | + * future use, as in realhost(). First, we have to look for it by | |
2746 | + * address to know if it's already in the cache by another name. | |
2747 | + */ | |
2748 | + /* | |
2749 | + * Originally, we copied to in.s_addr, but it appears to be missing | |
2750 | + * on some systems. | |
2751 | + */ | |
2752 | + t = search_address (hlist, addr_s); | |
2753 | + if (t) /* Found in the list, as realname. */ | |
2754 | + { | |
2755 | + /* Set the default, 0 quality. */ | |
2756 | + hlist = add_hlist (hlist, hostname, addr_s, 0); | |
2757 | + return 1; | |
2758 | + } | |
2759 | + /* Since this is really the first time this host is encountered, | |
2760 | + * set quality to 1. | |
2761 | + */ | |
2762 | + hlist = add_hlist (hlist, hostname, addr_s, 1); | |
2763 | + return 1; | |
2764 | +} | |
2765 | +#undef MAX_AF | |
2766 | +#else /* INET6 */ | |
2767 | int | |
2768 | store_hostaddress (unsigned char *where, const char *hostname) | |
2769 | { | |
2770 | @@ -131,8 +326,10 @@ | |
2771 | struct in_addr in; | |
2772 | char *inet_s; | |
2773 | ||
2774 | - /* If the address is of the form d.d.d.d, there will be no trouble | |
2775 | - with it. */ | |
2776 | + /* | |
2777 | + * If the address is of the form d.d.d.d, there will be no trouble | |
2778 | + * with it. | |
2779 | + */ | |
2780 | addr = (unsigned long)inet_addr (hostname); | |
2781 | if ((int)addr == -1) | |
2782 | { | |
2783 | @@ -178,6 +375,7 @@ | |
2784 | hlist = add_hlist (hlist, hostname, inet_s, 1); | |
2785 | return 1; | |
2786 | } | |
2787 | +#endif /* INET6 */ | |
2788 | ||
2789 | /* Add a host to the host list. The list is sorted by addresses. For | |
2790 | equal addresses, the entries with quality should bubble towards the | |
2791 | diff -urN wget-1.5.3.orig/src/host.h wget-1.5.3/src/host.h | |
2792 | --- wget-1.5.3.orig/src/host.h Sat May 22 13:25:03 1999 | |
2793 | +++ wget-1.5.3/src/host.h Sat May 22 13:31:53 1999 | |
2794 | @@ -25,8 +25,11 @@ | |
2795 | /* Function declarations */ | |
2796 | ||
2797 | struct hostent *ngethostbyname PARAMS ((const char *)); | |
2798 | +#ifdef INET6 | |
2799 | +int store_hostaddress PARAMS ((struct sockaddr_storage *, const char *)); | |
2800 | +#else | |
2801 | int store_hostaddress PARAMS ((unsigned char *, const char *)); | |
2802 | - | |
2803 | +#endif | |
2804 | void clean_hosts PARAMS ((void)); | |
2805 | ||
2806 | char *realhost PARAMS ((const char *)); | |
2807 | diff -urN wget-1.5.3.orig/src/init.c wget-1.5.3/src/init.c | |
2808 | --- wget-1.5.3.orig/src/init.c Sat May 22 13:25:03 1999 | |
2809 | +++ wget-1.5.3/src/init.c Sat May 22 13:31:56 1999 | |
2810 | @@ -113,6 +113,8 @@ | |
2811 | { "httpproxy", &opt.http_proxy, cmd_string }, | |
2812 | { "httpuser", &opt.http_user, cmd_string }, | |
2813 | { "ignorelength", &opt.ignore_length, cmd_boolean }, | |
2814 | + { "inet", &opt.inet, cmd_boolean }, | |
2815 | + { "inet6", &opt.inet6, cmd_boolean }, | |
2816 | { "includedirectories", &opt.includes, cmd_directory_vector }, | |
2817 | { "input", &opt.input_filename, cmd_string }, | |
2818 | { "killlonger", &opt.kill_longer, cmd_boolean }, | |
2819 | diff -urN wget-1.5.3.orig/src/main.c wget-1.5.3/src/main.c | |
2820 | --- wget-1.5.3.orig/src/main.c Sat May 22 13:25:03 1999 | |
2821 | +++ wget-1.5.3/src/main.c Sat May 22 13:32:00 1999 | |
2822 | @@ -157,6 +157,8 @@ | |
2823 | --http-passwd=PASS set http password to PASS.\n\ | |
2824 | -C, --cache=on/off (dis)allow server-cached data (normally allowed).\n\ | |
2825 | --ignore-length ignore `Content-Length\' header field.\n\ | |
2826 | + --inet use IP version 4 socket.\n\ | |
2827 | + --inet6 use IP version 6 socket.\n\ | |
2828 | --header=STRING insert STRING among the headers.\n\ | |
2829 | --proxy-user=USER set USER as proxy username.\n\ | |
2830 | --proxy-passwd=PASS set PASS as proxy password.\n\ | |
2831 | @@ -195,7 +197,7 @@ | |
2832 | main (int argc, char *const *argv) | |
2833 | { | |
2834 | char **url, **t; | |
2835 | - int i, c, nurl, status, append_to_log; | |
2836 | + int i, c, nurl, status, append_to_log, af; | |
2837 | ||
2838 | static struct option long_options[] = | |
2839 | { | |
2840 | @@ -211,6 +213,8 @@ | |
2841 | { "force-html", no_argument, NULL, 'F'}, | |
2842 | { "help", no_argument, NULL, 'h' }, | |
2843 | { "ignore-length", no_argument, NULL, 10 }, | |
2844 | + { "inet", no_argument, NULL, '4' }, | |
2845 | + { "inet6", no_argument, NULL, '6' }, | |
2846 | { "mirror", no_argument, NULL, 'm' }, | |
2847 | { "no-clobber", no_argument, NULL, 13 }, | |
2848 | { "no-directories", no_argument, NULL, 19 }, | |
2849 | @@ -334,6 +338,12 @@ | |
2850 | case 22: | |
2851 | setval ("simplehostcheck", "on"); | |
2852 | break; | |
2853 | + case '4': | |
2854 | + setval ("inet", "on"); | |
2855 | + break; | |
2856 | + case '6': | |
2857 | + setval ("inet6", "on"); | |
2858 | + break; | |
2859 | case 'b': | |
2860 | setval ("background", "on"); | |
2861 | break; | |
2862 | @@ -572,6 +582,13 @@ | |
2863 | print_usage (); | |
2864 | exit (1); | |
2865 | } | |
2866 | + | |
2867 | + if (opt.inet && opt.inet6) { | |
2868 | + printf (_("Can't inet and inet6 be specified at the same time.\n")); | |
2869 | + print_usage (); | |
2870 | + exit (1); | |
2871 | + } | |
2872 | + | |
2873 | if (opt.timestamping && opt.noclobber) | |
2874 | { | |
2875 | printf (_("\ | |
2876 | diff -urN wget-1.5.3.orig/src/options.h wget-1.5.3/src/options.h | |
2877 | --- wget-1.5.3.orig/src/options.h Sat May 22 13:25:03 1999 | |
2878 | +++ wget-1.5.3/src/options.h Sat May 22 13:32:17 1999 | |
2879 | @@ -30,6 +30,8 @@ | |
2880 | data than specified in | |
2881 | content-length? */ | |
2882 | int ignore_length; /* Do we heed content-length at all? */ | |
2883 | + int inet; | |
2884 | + int inet6; | |
2885 | int recursive; /* Are we recursive? */ | |
2886 | int spanhost; /* Do we span across hosts in | |
2887 | recursion? */ |