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