+++ /dev/null
-diff -urN wget-1.5.3.org/configure wget-1.5.3/configure
---- wget-1.5.3.org/configure Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/configure Sat Dec 16 11:45:15 2000
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -12,6 +12,9 @@
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
- ac_help="$ac_help
-+ --enable-ipv6 Enable ipv6 (with ipv4) support
-+ --disable-ipv6 Disable ipv6 support"
-+ac_help="$ac_help
- --with-socks use the socks library"
- ac_help="$ac_help
- --disable-opie disable support for opie or s/key FTP login"
-@@ -59,6 +62,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -342,7 +346,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -512,9 +516,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -537,6 +543,334 @@
- PACKAGE=wget
-
-
-+# Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:550: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="gcc"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+if test -z "$CC"; then
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:580: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_prog_rejected=no
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# -gt 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ set dummy "$ac_dir/$ac_word" "$@"
-+ shift
-+ ac_cv_prog_CC="$@"
-+ fi
-+fi
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ if test -z "$CC"; then
-+ case "`uname -s`" in
-+ *win32* | *WIN32*)
-+ # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:631: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="cl"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+ esac
-+ fi
-+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-+fi
-+
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+echo "configure:663: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+cat > conftest.$ac_ext << EOF
-+
-+#line 674 "configure"
-+#include "confdefs.h"
-+
-+main(){return(0);}
-+EOF
-+if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ ac_cv_prog_cc_works=yes
-+ # If we can't run a trivial program, we are probably using a cross compiler.
-+ if (./conftest; exit) 2>/dev/null; then
-+ ac_cv_prog_cc_cross=no
-+ else
-+ ac_cv_prog_cc_cross=yes
-+ fi
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ ac_cv_prog_cc_works=no
-+fi
-+rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-+if test $ac_cv_prog_cc_works = no; then
-+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+fi
-+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+cross_compiling=$ac_cv_prog_cc_cross
-+
-+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+echo "configure:710: checking whether we are using GNU C" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+ yes;
-+#endif
-+EOF
-+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
-+ ac_cv_prog_gcc=yes
-+else
-+ ac_cv_prog_gcc=no
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-+
-+if test $ac_cv_prog_gcc = yes; then
-+ GCC=yes
-+else
-+ GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:738: checking whether ${CC-cc} accepts -g" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ ac_cv_prog_cc_g=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+
-+
-+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+echo "configure:771: checking how to run the C preprocessor" >&5
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ # This must be in double quotes, not single quotes, because CPP may get
-+ # substituted into the Makefile and "${CC-cc}" will confuse make.
-+ CPP="${CC-cc} -E"
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp.
-+ cat > conftest.$ac_ext <<EOF
-+#line 786 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -E -traditional-cpp"
-+ cat > conftest.$ac_ext <<EOF
-+#line 803 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -nologo -E"
-+ cat > conftest.$ac_ext <<EOF
-+#line 820 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP=/lib/cpp
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+ ac_cv_prog_CPP="$CPP"
-+fi
-+ CPP="$ac_cv_prog_CPP"
-+else
-+ ac_cv_prog_CPP="$CPP"
-+fi
-+echo "$ac_t""$CPP" 1>&6
-+
-+echo $ac_n "checking for AIX""... $ac_c" 1>&6
-+echo "configure:851: checking for AIX" >&5
-+cat > conftest.$ac_ext <<EOF
-+#line 853 "configure"
-+#include "confdefs.h"
-+#ifdef _AIX
-+ yes
-+#endif
-+
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
-+#define _ALL_SOURCE 1
-+EOF
-+
-+else
-+ rm -rf conftest*
-+ echo "$ac_t""no" 1>&6
-+fi
-+rm -f conftest*
-+
-+
-+
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
-@@ -558,26 +892,26 @@
-
-
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:567: checking host system type" >&5
-+echo "configure:901: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
- NONE)
- case $nonopt in
- NONE)
-- if host_alias=`$ac_config_guess`; then :
-+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
- esac
-
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-@@ -588,6 +922,430 @@
- EOF
-
-
-+echo $ac_n "checking whether to enable ipv6""... $ac_c" 1>&6
-+echo "configure:927: checking whether to enable ipv6" >&5
-+# Check whether --enable-ipv6 or --disable-ipv6 was given.
-+if test "${enable_ipv6+set}" = set; then
-+ enableval="$enable_ipv6"
-+ case "$enableval" in
-+ no)
-+ echo "$ac_t""no" 1>&6
-+ ipv6=no
-+ ;;
-+ *) echo "$ac_t""yes" 1>&6
-+ cat >> confdefs.h <<\EOF
-+#define ENABLE_IPV6 1
-+EOF
-+
-+ ipv6=yes
-+ ;;
-+ esac
-+else
-+ if test "$cross_compiling" = yes; then
-+ echo "$ac_t""no" 1>&6
-+ ipv6=no
-+
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 951 "configure"
-+#include "confdefs.h"
-+ /* AF_INET6 avalable check */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+main()
-+{
-+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+ exit(1);
-+ else
-+ exit(0);
-+}
-+
-+EOF
-+if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+ echo "$ac_t""yes" 1>&6
-+ cat >> confdefs.h <<\EOF
-+#define ENABLE_IPV6 1
-+EOF
-+
-+ ipv6=yes
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
-+ echo "$ac_t""no" 1>&6
-+ ipv6=no
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+
-+
-+ipv6type=unknown
-+ipv6lib=none
-+
-+if test "$ipv6" = "yes"; then
-+ echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
-+echo "configure:991: checking ipv6 stack type" >&5
-+ for i in inria kame linux toshiba v6d zeta; do
-+ case $i in
-+ inria)
-+ cat > conftest.$ac_ext <<EOF
-+#line 996 "configure"
-+#include "confdefs.h"
-+dnl
-+#include <netinet/in.h>
-+#ifdef IPV6_INRIA_VERSION
-+yes
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ipv6type=$i;
-+ CFLAGS="-DINET6 $CFLAGS"
-+fi
-+rm -f conftest*
-+
-+ ;;
-+ kame)
-+ cat > conftest.$ac_ext <<EOF
-+#line 1015 "configure"
-+#include "confdefs.h"
-+dnl
-+#include <netinet/in.h>
-+#ifdef __KAME__
-+yes
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ipv6type=$i;
-+ CFLAGS="-DINET6 $CFLAGS"
-+fi
-+rm -f conftest*
-+
-+ ;;
-+ linux)
-+ if test -d /usr/inet6; then
-+ ipv6type=$i
-+ ipv6lib=inet6
-+ ipv6libdir=/usr/inet6/lib
-+ CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS"
-+ fi
-+ ;;
-+ toshiba)
-+ cat > conftest.$ac_ext <<EOF
-+#line 1042 "configure"
-+#include "confdefs.h"
-+dnl
-+#include <sys/param.h>
-+#ifdef _TOSHIBA_INET6
-+yes
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ipv6type=$i;
-+ ipv6lib=inet6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-DINET6 $CFLAGS"
-+fi
-+rm -f conftest*
-+
-+ ;;
-+ v6d)
-+ cat > conftest.$ac_ext <<EOF
-+#line 1063 "configure"
-+#include "confdefs.h"
-+dnl
-+#include </usr/local/v6/include/sys/v6config.h>
-+#ifdef __V6D__
-+yes
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ipv6type=$i;
-+ ipv6lib=v6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-I/usr/local/v6/include $CFLAGS"
-+fi
-+rm -f conftest*
-+
-+ ;;
-+ zeta)
-+ cat > conftest.$ac_ext <<EOF
-+#line 1084 "configure"
-+#include "confdefs.h"
-+dnl
-+#include <sys/param.h>
-+#ifdef _ZETA_MINAMI_INET6
-+yes
-+#endif
-+EOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ egrep "yes" >/dev/null 2>&1; then
-+ rm -rf conftest*
-+ ipv6type=$i;
-+ ipv6lib=inet6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-DINET6 $CFLAGS"
-+fi
-+rm -f conftest*
-+
-+ ;;
-+ esac
-+ if test "$ipv6type" != "unknown"; then
-+ break
-+ fi
-+ done
-+ echo "$ac_t""$ipv6type" 1>&6
-+fi
-+
-+if test "$ipv6" = "yes" -a -d /usr/local/v6/lib; then
-+ ac_inet6_LDFLAGS="inet6"
-+ ipv6libdir=/usr/local/v6/lib
-+ LDFLAGS="$LDFLAGS -L/usr/local/v6/lib"
-+ echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
-+echo "configure:1116: checking for getaddrinfo in -linet6" >&5
-+ac_lib_var=`echo inet6'_'getaddrinfo | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-linet6 $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1124 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char getaddrinfo();
-+
-+int main() {
-+getaddrinfo()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_lib=HAVE_LIB`echo inet6 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
-+EOF
-+
-+ LIBS="-linet6 $LIBS"
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+ipv6lib="$ac_inet6_LDFLAGS"
-+fi
-+
-+fi
-+
-+if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
-+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
-+ LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-+ fi
-+fi
-+
-+echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6
-+echo "configure:1172: checking getaddrinfo bug" >&5
-+if test "$cross_compiling" = yes; then
-+ echo "$ac_t""buggy" 1>&6
-+buggygetaddrinfo=yes
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 1178 "configure"
-+#include "confdefs.h"
-+
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <string.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#ifndef AF_LOCAL
-+#define AF_LOCAL AF_UNIX
-+#endif
-+
-+main()
-+{
-+ int passive, gaierr, inet4 = 0, inet6 = 0;
-+ struct addrinfo hints, *ai, *aitop;
-+ char straddr[INET6_ADDRSTRLEN], strport[16];
-+
-+ for (passive = 0; passive <= 1; passive++) {
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_flags = passive ? AI_PASSIVE : 0;
-+ hints.ai_socktype = SOCK_STREAM;
-+ if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
-+ (void)gai_strerror(gaierr);
-+ goto bad;
-+ }
-+ for (ai = aitop; ai; ai = ai->ai_next) {
-+ if (ai->ai_family == AF_LOCAL) continue;
-+ if (ai->ai_addr == NULL ||
-+ ai->ai_addrlen == 0 ||
-+ getnameinfo(ai->ai_addr, ai->ai_addrlen,
-+ straddr, sizeof(straddr), strport, sizeof(strport),
-+ NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-+ goto bad;
-+ }
-+ if (strcmp(strport, "54321") != 0) {
-+ goto bad;
-+ }
-+ switch (ai->ai_family) {
-+ case AF_INET:
-+ if (passive) {
-+ if (strcmp(straddr, "0.0.0.0") != 0) {
-+ goto bad;
-+ }
-+ } else {
-+ if (strcmp(straddr, "127.0.0.1") != 0) {
-+ goto bad;
-+ }
-+ }
-+ inet4++;
-+ break;
-+ case AF_INET6:
-+ if (passive) {
-+ if (strcmp(straddr, "::") != 0) {
-+ goto bad;
-+ }
-+ } else {
-+ if (strcmp(straddr, "::1") != 0) {
-+ goto bad;
-+ }
-+ }
-+ inet6++;
-+ break;
-+ case AF_UNSPEC:
-+ goto bad;
-+ break;
-+ default:
-+ /* another family support? */
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (!(inet4 == 0 || inet4 == 2))
-+ goto bad;
-+ if (!(inet6 == 0 || inet6 == 2))
-+ goto bad;
-+
-+ if (aitop)
-+ freeaddrinfo(aitop);
-+ exit(0);
-+
-+ bad:
-+ if (aitop)
-+ freeaddrinfo(aitop);
-+ exit(1);
-+}
-+
-+EOF
-+if { (eval echo configure:1269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+ echo "$ac_t""good" 1>&6
-+buggygetaddrinfo=no
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -fr conftest*
-+ echo "$ac_t""buggy" 1>&6
-+buggygetaddrinfo=yes
-+fi
-+rm -fr conftest*
-+fi
-+
-+
-+if test "$buggygetaddrinfo" = "yes"; then
-+ if test "$ipv6" = "yes"; then
-+ echo 'Fatal: You must get working getaddrinfo() function.'
-+ echo ' or you can specify "--disable-ipv6"'.
-+ exit 1
-+ else
-+ for ac_func in getaddrinfo getnameinfo
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:1293: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 1298 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-+fi
-+done
-+
-+
-+ fi
-+fi
-+
- # Check whether --with-socks or --without-socks was given.
- if test "${with_socks+set}" = set; then
- withval="$with_socks"
-@@ -648,7 +1406,7 @@
-
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:652: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1410: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -682,28 +1440,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:690: checking for a BSD compatible install" >&5
-+echo "configure:1449: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -733,6 +1493,8 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-@@ -740,177 +1502,6 @@
- test -z "$CFLAGS" && CFLAGS= auto_cflags=1
- test -z "$CC" && cc_specified=yes
-
--# Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:747: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- ac_cv_prog_CC="gcc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--fi
--fi
--CC="$ac_cv_prog_CC"
--if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--if test -z "$CC"; then
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:776: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
--else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- ac_prog_rejected=no
-- for ac_dir in $PATH; do
-- test -z "$ac_dir" && ac_dir=.
-- if test -f $ac_dir/$ac_word; then
-- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- break
-- fi
-- done
-- IFS="$ac_save_ifs"
--if test $ac_prog_rejected = yes; then
-- # We found a bogon in the path, so make sure we never use it.
-- set dummy $ac_cv_prog_CC
-- shift
-- if test $# -gt 0; then
-- # We chose a different compiler from the bogus one.
-- # However, it has the same basename, so the bogon will be chosen
-- # first if we set CC to just the basename; use the full file name.
-- shift
-- set dummy "$ac_dir/$ac_word" "$@"
-- shift
-- ac_cv_prog_CC="$@"
-- fi
--fi
--fi
--fi
--CC="$ac_cv_prog_CC"
--if test -n "$CC"; then
-- echo "$ac_t""$CC" 1>&6
--else
-- echo "$ac_t""no" 1>&6
--fi
--
-- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
--fi
--
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:824: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
--
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--cat > conftest.$ac_ext <<EOF
--#line 834 "configure"
--#include "confdefs.h"
--main(){return(0);}
--EOF
--if { (eval echo configure:838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- ac_cv_prog_cc_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cc_cross=no
-- else
-- ac_cv_prog_cc_cross=yes
-- fi
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- ac_cv_prog_cc_works=no
--fi
--rm -fr conftest*
--
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
-- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:858: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:863: checking whether we are using GNU C" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- cat > conftest.c <<EOF
--#ifdef __GNUC__
-- yes;
--#endif
--EOF
--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
-- ac_cv_prog_gcc=yes
--else
-- ac_cv_prog_gcc=no
--fi
--fi
--
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
--
--if test $ac_cv_prog_gcc = yes; then
-- GCC=yes
-- ac_test_CFLAGS="${CFLAGS+set}"
-- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS=
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:887: checking whether ${CC-cc} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-- ac_cv_prog_cc_g=yes
--else
-- ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
--
--fi
--
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-- elif test $ac_cv_prog_cc_g = yes; then
-- CFLAGS="-g -O2"
-- else
-- CFLAGS="-O2"
-- fi
--else
-- GCC=
-- test "${CFLAGS+set}" = set || CFLAGS="-g"
--fi
--
--
- if test -n "$auto_cflags"; then
- if test -n "$GCC"; then
- CFLAGS="$CFLAGS -O2 -Wall -Wno-implicit"
-@@ -923,92 +1514,6 @@
- fi
- fi
-
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:928: checking how to run the C preprocessor" >&5
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
-- CPP=
--fi
--if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- # This must be in double quotes, not single quotes, because CPP may get
-- # substituted into the Makefile and "${CC-cc}" will confuse make.
-- CPP="${CC-cc} -E"
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp.
-- cat > conftest.$ac_ext <<EOF
--#line 943 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
--if test -z "$ac_err"; then
-- :
--else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP="${CC-cc} -E -traditional-cpp"
-- cat > conftest.$ac_ext <<EOF
--#line 960 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
--if test -z "$ac_err"; then
-- :
--else
-- echo "$ac_err" >&5
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- CPP=/lib/cpp
--fi
--rm -f conftest*
--fi
--rm -f conftest*
-- ac_cv_prog_CPP="$CPP"
--fi
-- CPP="$ac_cv_prog_CPP"
--else
-- ac_cv_prog_CPP="$CPP"
--fi
--echo "$ac_t""$CPP" 1>&6
--
--echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:989: checking for AIX" >&5
--cat > conftest.$ac_ext <<EOF
--#line 991 "configure"
--#include "confdefs.h"
--#ifdef _AIX
-- yes
--#endif
--
--EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "yes" >/dev/null 2>&1; then
-- rm -rf conftest*
-- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
--#define _ALL_SOURCE 1
--EOF
--
--else
-- rm -rf conftest*
-- echo "$ac_t""no" 1>&6
--fi
--rm -f conftest*
--
--
--
- case "$host_os" in
- *win32) exeext='.exe';;
- *) exeext='';;
-@@ -1017,7 +1522,7 @@
-
-
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:1021: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:1526: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1033,7 +1538,7 @@
- do
- CC="$ac_save_CC $ac_arg"
- cat > conftest.$ac_ext <<EOF
--#line 1037 "configure"
-+#line 1542 "configure"
- #include "confdefs.h"
- #if !defined(__STDC__) || __STDC__ != 1
- choke me
-@@ -1051,7 +1556,7 @@
- struct s2 {int (*f) (double a);};
- ; return 0; }
- EOF
--if { (eval echo configure:1055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -1073,7 +1578,7 @@
-
-
- echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
--echo "configure:1077: checking for function prototypes" >&5
-+echo "configure:1582: checking for function prototypes" >&5
- if test "$am_cv_prog_cc_stdc" != no; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-@@ -1086,12 +1591,12 @@
- U=_ ANSI2KNR=./ansi2knr
- # Ensure some checks needed by ansi2knr itself.
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1090: checking for ANSI C header files" >&5
-+echo "configure:1595: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1095 "configure"
-+#line 1600 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1099,8 +1604,8 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
-@@ -1116,7 +1621,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1120 "configure"
-+#line 1625 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1134,7 +1639,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1138 "configure"
-+#line 1643 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1155,7 +1660,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1159 "configure"
-+#line 1664 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1166,7 +1671,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1193,18 +1698,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1197: checking for $ac_hdr" >&5
-+echo "configure:1702: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1202 "configure"
-+#line 1707 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1233,12 +1738,12 @@
-
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1237: checking for working const" >&5
-+echo "configure:1742: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1242 "configure"
-+#line 1747 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -1287,7 +1792,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -1308,12 +1813,12 @@
- fi
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1312: checking for size_t" >&5
-+echo "configure:1817: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1317 "configure"
-+#line 1822 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1322,7 +1827,7 @@
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_size_t=yes
- else
-@@ -1341,12 +1846,12 @@
- fi
-
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:1345: checking for pid_t" >&5
-+echo "configure:1850: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1350 "configure"
-+#line 1855 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1355,7 +1860,7 @@
- #endif
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-+ egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_pid_t=yes
- else
-@@ -1374,14 +1879,14 @@
- fi
-
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:1378: checking whether byte ordering is bigendian" >&5
-+echo "configure:1883: checking whether byte ordering is bigendian" >&5
- if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat > conftest.$ac_ext <<EOF
--#line 1385 "configure"
-+#line 1890 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -1392,11 +1897,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat > conftest.$ac_ext <<EOF
--#line 1400 "configure"
-+#line 1905 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -1407,7 +1912,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_bigendian=yes
- else
-@@ -1427,7 +1932,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 1431 "configure"
-+#line 1936 "configure"
- #include "confdefs.h"
- main () {
- /* Are we little or big endian? From Harbison&Steele. */
-@@ -1440,7 +1945,7 @@
- exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_bigendian=no
- else
-@@ -1468,18 +1973,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1472: checking for $ac_hdr" >&5
-+echo "configure:1977: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1477 "configure"
-+#line 1982 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1508,18 +2013,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1512: checking for $ac_hdr" >&5
-+echo "configure:2017: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1517 "configure"
-+#line 2022 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1545,12 +2050,12 @@
- done
-
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:1549: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:2054: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1554 "configure"
-+#line 2059 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -1559,7 +2064,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -1581,12 +2086,12 @@
-
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1585: checking return type of signal handlers" >&5
-+echo "configure:2090: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1590 "configure"
-+#line 2095 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1603,7 +2108,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -1623,10 +2128,10 @@
-
-
- echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
--echo "configure:1627: checking for struct utimbuf" >&5
-+echo "configure:2132: checking for struct utimbuf" >&5
- if test x"$ac_cv_header_utime_h" = xyes; then
- cat > conftest.$ac_ext <<EOF
--#line 1630 "configure"
-+#line 2135 "configure"
- #include "confdefs.h"
- #include <utime.h>
- EOF
-@@ -1651,19 +2156,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:1655: checking for working alloca.h" >&5
-+echo "configure:2160: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1660 "configure"
-+#line 2165 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:1667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_header_alloca_h=yes
- else
-@@ -1684,25 +2189,30 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1688: checking for alloca" >&5
-+echo "configure:2193: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1693 "configure"
-+#line 2198 "configure"
- #include "confdefs.h"
-
- #ifdef __GNUC__
- # define alloca __builtin_alloca
- #else
--# if HAVE_ALLOCA_H
--# include <alloca.h>
-+# ifdef _MSC_VER
-+# include <malloc.h>
-+# define alloca _alloca
- # else
--# ifdef _AIX
-- #pragma alloca
-+# if HAVE_ALLOCA_H
-+# include <alloca.h>
- # else
--# ifndef alloca /* predefined by HP cc +Olibcalls */
-+# ifdef _AIX
-+ #pragma alloca
-+# else
-+# ifndef alloca /* predefined by HP cc +Olibcalls */
- char *alloca ();
-+# endif
- # endif
- # endif
- # endif
-@@ -1712,7 +2222,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_func_alloca_works=yes
- else
-@@ -1737,19 +2247,19 @@
- # that cause trouble. Some versions do not even contain alloca or
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
-- ALLOCA=alloca.o
-+ ALLOCA=alloca.${ac_objext}
- cat >> confdefs.h <<\EOF
- #define C_ALLOCA 1
- EOF
-
-
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:1748: checking whether alloca needs Cray hooks" >&5
-+echo "configure:2258: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1753 "configure"
-+#line 2263 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -1774,12 +2284,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1778: checking for $ac_func" >&5
-+echo "configure:2288: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1783 "configure"
-+#line 2293 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1802,7 +2312,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1829,7 +2339,7 @@
- fi
-
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:1833: checking stack direction for C alloca" >&5
-+echo "configure:2343: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1837,7 +2347,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 1841 "configure"
-+#line 2351 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -1856,7 +2366,7 @@
- exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_stack_direction=1
- else
-@@ -1880,12 +2390,12 @@
- for ac_func in strdup strstr strcasecmp strncasecmp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1884: checking for $ac_func" >&5
-+echo "configure:2394: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1889 "configure"
-+#line 2399 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1908,7 +2418,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1935,12 +2445,12 @@
- for ac_func in gettimeofday mktime strptime
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1939: checking for $ac_func" >&5
-+echo "configure:2449: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1944 "configure"
-+#line 2454 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1963,7 +2473,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1990,12 +2500,12 @@
- for ac_func in strerror vsnprintf select signal symlink access isatty
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1994: checking for $ac_func" >&5
-+echo "configure:2504: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1999 "configure"
-+#line 2509 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2018,7 +2528,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2045,12 +2555,12 @@
- for ac_func in uname gethostname
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2049: checking for $ac_func" >&5
-+echo "configure:2559: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2054 "configure"
-+#line 2564 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2073,7 +2583,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2101,12 +2611,12 @@
- for ac_func in gethostbyname
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2105: checking for $ac_func" >&5
-+echo "configure:2615: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2110 "configure"
-+#line 2620 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2129,7 +2639,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2151,7 +2661,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:2155: checking for gethostbyname in -lnsl" >&5
-+echo "configure:2665: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2159,7 +2669,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2163 "configure"
-+#line 2673 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2170,7 +2680,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2204,7 +2714,7 @@
-
-
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:2208: checking for socket in -lsocket" >&5
-+echo "configure:2718: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2212,7 +2722,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2216 "configure"
-+#line 2726 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2223,7 +2733,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2254,7 +2764,7 @@
- if test "x${with_socks}" = xyes
- then
- echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
--echo "configure:2258: checking for main in -lresolv" >&5
-+echo "configure:2768: checking for main in -lresolv" >&5
- ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2262,14 +2772,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2266 "configure"
-+#line 2776 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2297,7 +2807,7 @@
- fi
-
- echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6
--echo "configure:2301: checking for Rconnect in -lsocks" >&5
-+echo "configure:2811: checking for Rconnect in -lsocks" >&5
- ac_lib_var=`echo socks'_'Rconnect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2305,7 +2815,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocks $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2309 "configure"
-+#line 2819 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2316,7 +2826,7 @@
- Rconnect()
- ; return 0; }
- EOF
--if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2348,7 +2858,7 @@
- ALL_LINGUAS="cs de hr no it pt_BR"
-
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:2352: checking whether NLS is requested" >&5
-+echo "configure:2862: checking whether NLS is requested" >&5
- # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
- enableval="$enable_nls"
-@@ -2365,7 +2875,7 @@
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2369: checking for $ac_word" >&5
-+echo "configure:2879: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2399,7 +2909,7 @@
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2403: checking for $ac_word" >&5
-+echo "configure:2913: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2434,7 +2944,7 @@
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2438: checking for $ac_word" >&5
-+echo "configure:2948: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2442,9 +2952,13 @@
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
-+ ?:/*)
-+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-+ ;;
- *)
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-@@ -2480,18 +2994,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2484: checking for $ac_hdr" >&5
-+echo "configure:2998: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2489 "configure"
-+#line 3003 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:3008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -2520,12 +3034,12 @@
- for ac_func in gettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2524: checking for $ac_func" >&5
-+echo "configure:3038: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2529 "configure"
-+#line 3043 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2548,7 +3062,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2570,7 +3084,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:2574: checking for gettext in -lintl" >&5
-+echo "configure:3088: checking for gettext in -lintl" >&5
- ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2578,7 +3092,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2582 "configure"
-+#line 3096 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2589,7 +3103,7 @@
- gettext()
- ; return 0; }
- EOF
--if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2657,15 +3171,16 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2661: checking for $ac_word" >&5
-+echo "configure:3175: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$MAKEINFO"; then
- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_MAKEINFO="$ac_prog"
-@@ -2715,7 +3230,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -2782,7 +3297,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -2802,9 +3317,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -2825,18 +3342,20 @@
- s%@mandir@%$mandir%g
- s%@VERSION@%$VERSION%g
- s%@PACKAGE@%$PACKAGE%g
-+s%@CC@%$CC%g
-+s%@CPP@%$CPP%g
- s%@host@%$host%g
- s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g
- s%@host_vendor@%$host_vendor%g
- s%@host_os@%$host_os%g
-+s%@LIBOBJS@%$LIBOBJS%g
- s%@MD5_OBJ@%$MD5_OBJ%g
- s%@OPIE_OBJ@%$OPIE_OBJ%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
--s%@CC@%$CC%g
--s%@CPP@%$CPP%g
- s%@exeext@%$exeext%g
- s%@U@%$U%g
- s%@ANSI2KNR@%$ANSI2KNR%g
-diff -urN wget-1.5.3.org/configure.in wget-1.5.3/configure.in
---- wget-1.5.3.org/configure.in Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/configure.in Sat Dec 16 11:45:15 2000
-@@ -32,12 +32,250 @@
- PACKAGE=wget
- AC_SUBST(PACKAGE)
-
-+AC_PROG_CC
-+
-+dnl
-+dnl Handle AIX
-+dnl
-+AC_AIX
-+
- dnl
- dnl Get cannonical host
- dnl
- AC_CANONICAL_HOST
- AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
-
-+AC_MSG_CHECKING([whether to enable ipv6])
-+AC_ARG_ENABLE(ipv6,
-+[ --enable-ipv6 Enable ipv6 (with ipv4) support
-+ --disable-ipv6 Disable ipv6 support],
-+[ case "$enableval" in
-+ no)
-+ AC_MSG_RESULT(no)
-+ ipv6=no
-+ ;;
-+ *) AC_MSG_RESULT(yes)
-+ AC_DEFINE(ENABLE_IPV6)
-+ ipv6=yes
-+ ;;
-+ esac ],
-+
-+ AC_TRY_RUN([ /* AF_INET6 avalable check */
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+main()
-+{
-+ if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-+ exit(1);
-+ else
-+ exit(0);
-+}
-+],
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE(ENABLE_IPV6)
-+ ipv6=yes,
-+ AC_MSG_RESULT(no)
-+ ipv6=no,
-+ AC_MSG_RESULT(no)
-+ ipv6=no
-+))
-+
-+ipv6type=unknown
-+ipv6lib=none
-+
-+if test "$ipv6" = "yes"; then
-+ AC_MSG_CHECKING([ipv6 stack type])
-+ for i in inria kame linux toshiba v6d zeta; do
-+ case $i in
-+ inria)
-+ dnl http://www.kame.net/
-+ AC_EGREP_CPP(yes, [dnl
-+#include <netinet/in.h>
-+#ifdef IPV6_INRIA_VERSION
-+yes
-+#endif],
-+ [ipv6type=$i;
-+ CFLAGS="-DINET6 $CFLAGS"])
-+ ;;
-+ kame)
-+ dnl http://www.kame.net/
-+ AC_EGREP_CPP(yes, [dnl
-+#include <netinet/in.h>
-+#ifdef __KAME__
-+yes
-+#endif],
-+ [ipv6type=$i;
-+ CFLAGS="-DINET6 $CFLAGS"])
-+ ;;
-+ linux)
-+ dnl http://www.v6.linux.or.jp/
-+ if test -d /usr/inet6; then
-+ ipv6type=$i
-+ ipv6lib=inet6
-+ ipv6libdir=/usr/inet6/lib
-+ CFLAGS="-DINET6 -I/usr/inet6/include $CFLAGS"
-+ fi
-+ ;;
-+ toshiba)
-+ AC_EGREP_CPP(yes, [dnl
-+#include <sys/param.h>
-+#ifdef _TOSHIBA_INET6
-+yes
-+#endif],
-+ [ipv6type=$i;
-+ ipv6lib=inet6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-DINET6 $CFLAGS"])
-+ ;;
-+ v6d)
-+ AC_EGREP_CPP(yes, [dnl
-+#include </usr/local/v6/include/sys/v6config.h>
-+#ifdef __V6D__
-+yes
-+#endif],
-+ [ipv6type=$i;
-+ ipv6lib=v6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-I/usr/local/v6/include $CFLAGS"])
-+ ;;
-+ zeta)
-+ AC_EGREP_CPP(yes, [dnl
-+#include <sys/param.h>
-+#ifdef _ZETA_MINAMI_INET6
-+yes
-+#endif],
-+ [ipv6type=$i;
-+ ipv6lib=inet6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ CFLAGS="-DINET6 $CFLAGS"])
-+ ;;
-+ esac
-+ if test "$ipv6type" != "unknown"; then
-+ break
-+ fi
-+ done
-+ AC_MSG_RESULT($ipv6type)
-+fi
-+
-+if test "$ipv6" = "yes" -a -d /usr/local/v6/lib; then
-+ ac_inet6_LDFLAGS="inet6"
-+ ipv6libdir=/usr/local/v6/lib
-+ LDFLAGS="$LDFLAGS -L/usr/local/v6/lib"
-+ AC_CHECK_LIB(inet6, getaddrinfo, , ipv6lib="$ac_inet6_LDFLAGS")
-+fi
-+
-+if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
-+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
-+ LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-+ fi
-+fi
-+
-+AC_MSG_CHECKING(getaddrinfo bug)
-+AC_TRY_RUN([
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <string.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#ifndef AF_LOCAL
-+#define AF_LOCAL AF_UNIX
-+#endif
-+
-+main()
-+{
-+ int passive, gaierr, inet4 = 0, inet6 = 0;
-+ struct addrinfo hints, *ai, *aitop;
-+ char straddr[INET6_ADDRSTRLEN], strport[16];
-+
-+ for (passive = 0; passive <= 1; passive++) {
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_flags = passive ? AI_PASSIVE : 0;
-+ hints.ai_socktype = SOCK_STREAM;
-+ if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
-+ (void)gai_strerror(gaierr);
-+ goto bad;
-+ }
-+ for (ai = aitop; ai; ai = ai->ai_next) {
-+ if (ai->ai_family == AF_LOCAL) continue;
-+ if (ai->ai_addr == NULL ||
-+ ai->ai_addrlen == 0 ||
-+ getnameinfo(ai->ai_addr, ai->ai_addrlen,
-+ straddr, sizeof(straddr), strport, sizeof(strport),
-+ NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
-+ goto bad;
-+ }
-+ if (strcmp(strport, "54321") != 0) {
-+ goto bad;
-+ }
-+ switch (ai->ai_family) {
-+ case AF_INET:
-+ if (passive) {
-+ if (strcmp(straddr, "0.0.0.0") != 0) {
-+ goto bad;
-+ }
-+ } else {
-+ if (strcmp(straddr, "127.0.0.1") != 0) {
-+ goto bad;
-+ }
-+ }
-+ inet4++;
-+ break;
-+ case AF_INET6:
-+ if (passive) {
-+ if (strcmp(straddr, "::") != 0) {
-+ goto bad;
-+ }
-+ } else {
-+ if (strcmp(straddr, "::1") != 0) {
-+ goto bad;
-+ }
-+ }
-+ inet6++;
-+ break;
-+ case AF_UNSPEC:
-+ goto bad;
-+ break;
-+ default:
-+ /* another family support? */
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (!(inet4 == 0 || inet4 == 2))
-+ goto bad;
-+ if (!(inet6 == 0 || inet6 == 2))
-+ goto bad;
-+
-+ if (aitop)
-+ freeaddrinfo(aitop);
-+ exit(0);
-+
-+ bad:
-+ if (aitop)
-+ freeaddrinfo(aitop);
-+ exit(1);
-+}
-+],
-+AC_MSG_RESULT(good)
-+buggygetaddrinfo=no,
-+AC_MSG_RESULT(buggy)
-+buggygetaddrinfo=yes,
-+AC_MSG_RESULT(buggy)
-+buggygetaddrinfo=yes)
-+
-+if test "$buggygetaddrinfo" = "yes"; then
-+ if test "$ipv6" = "yes"; then
-+ echo 'Fatal: You must get working getaddrinfo() function.'
-+ echo ' or you can specify "--disable-ipv6"'.
-+ exit 1
-+ else
-+ AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
-+ fi
-+fi
-+
- dnl
- dnl Process features.
- dnl
-@@ -88,8 +326,6 @@
- test -z "$CFLAGS" && CFLAGS= auto_cflags=1
- test -z "$CC" && cc_specified=yes
-
--AC_PROG_CC
--
- dnl
- dnl if the user hasn't specified CFLAGS, then
- dnl if compiler is gcc, then use -O2 and some warning flags
-@@ -106,11 +342,6 @@
- esac
- fi
- fi
--
--dnl
--dnl Handle AIX
--dnl
--AC_AIX
-
- dnl
- dnl In case of {cyg,gnu}win32. Should be a _target_ test.
-diff -urN wget-1.5.3.org/src/connect.c wget-1.5.3/src/connect.c
---- wget-1.5.3.org/src/connect.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/connect.c Sat Dec 16 11:45:15 2000
-@@ -62,6 +62,59 @@
- uerr_t
- make_connection (int *sock, char *hostname, unsigned short port)
- {
-+#ifdef INET6
-+ struct sockaddr_storage sock_name;
-+ struct sockaddr_in *sin;
-+ struct sockaddr_in6 *sin6;
-+ size_t socksize;
-+
-+ /*
-+ * Get internet address of the host. We can do it either by calling
-+ * ngethostbyname, or by calling store_hostaddress, from host.c.
-+ * storehostaddress is better since it caches calls to
-+ * gethostbyname.
-+ */
-+ if (!store_hostaddress (&sock_name, hostname))
-+ return HOSTERR;
-+
-+ /* Set port and protocol */
-+ switch (sock_name.ss_family) {
-+ case AF_INET:
-+ sin = (struct sockaddr_in *) &sock_name;
-+ sin->sin_family = AF_INET;
-+#ifdef HAVE_SOCKADDR_SA_LEN
-+ sin->sin_len = sizeof (struct sockaddr_in);
-+#endif
-+ sin->sin_port = htons (port);
-+ socksize = sizeof (struct sockaddr_in);
-+ break;
-+ case AF_INET6:
-+ sin6 = (struct sockaddr_in6 *) &sock_name;
-+ sin6->sin6_family = AF_INET6;
-+#ifdef HAVE_SOCKADDR_SA_LEN
-+ sin6->sin6_len = sizeof (struct sockaddr_in6);
-+#endif
-+ sin6->sin6_port = htons (port);
-+ socksize = sizeof (struct sockaddr_in6);
-+ break;
-+ default:
-+ return HOSTERR;
-+ }
-+ /* Make an internet socket, stream type. */
-+ if ((*sock = socket (sock_name.ss_family, SOCK_STREAM, 0)) == -1)
-+ return CONSOCKERR;
-+
-+ /* Connect the socket to the remote host. */
-+ if (connect (*sock, (struct sockaddr *) &sock_name, socksize))
-+ {
-+ if (errno == ECONNREFUSED)
-+ return CONREFUSED;
-+ else
-+ return CONERROR;
-+ }
-+ DEBUGP (("Created fd %d.\n", *sock));
-+ return NOCONERROR;
-+#else /* !INET6 */
- struct sockaddr_in sock_name;
- /* struct hostent *hptr; */
-
-@@ -97,6 +150,7 @@
- }
- DEBUGP (("Created fd %d.\n", *sock));
- return NOCONERROR;
-+#endif /* INET6 */
- }
-
- /* Bind the local port PORT. This does all the necessary work, which
-@@ -106,22 +160,53 @@
- internal variable MPORT is set to the value of the ensuing master
- socket. Call acceptport() to block for and accept a connection. */
- uerr_t
--bindport (unsigned short *port)
-+bindport_af (unsigned short *port, int af)
- {
- int optval = 1;
-- static struct sockaddr_in srv;
--
-+ struct sockaddr* srv;
-+#ifdef INET6
-+ static struct sockaddr_storage ss;
-+ struct addrinfo hints, *res;
-+ char pbuf[NI_MAXSERV];
-+#else
-+ static struct sockaddr_in sin;
-+#endif
-+ int alen;
-+
-+#ifdef INET6
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_family = af;
-+ hints.ai_flags = AI_PASSIVE;
-+ sprintf(pbuf, "%d", *port);
-+ if (getaddrinfo(NULL, pbuf, &hints, &res) != 0)
-+ return CONSOCKERR;
-+ if (res->ai_addrlen > sizeof(ss))
-+ {
-+ freeaddrinfo(res);
-+ return CONSOCKERR;
-+ }
-+ memcpy(&ss, res->ai_addr, res->ai_addrlen);
-+ alen = res->ai_addrlen;
-+ freeaddrinfo(res);
-+ srv = (struct sockaddr *)&ss;
-+#else
-+ if (af != AF_INET)
-+ return CONSOCKERR;
-+ memset(&sin, 0, sizeof(sin));
-+ sin.sin_family = AF_INET;
-+ sin.sin_port = htons(*port);
-+ srv = (struct sockaddr *)&sin;
-+ alen = sizeof(sin);
-+#endif
-+ addr = srv;
- msock = -1;
-- addr = (struct sockaddr *) &srv;
-- if ((msock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
-+ if ((msock = socket (af, SOCK_STREAM, 0)) < 0)
- return CONSOCKERR;
- if (setsockopt (msock, SOL_SOCKET, SO_REUSEADDR,
- (char *)&optval, sizeof (optval)) < 0)
- return CONSOCKERR;
-- srv.sin_family = AF_INET;
-- srv.sin_addr.s_addr = htonl (INADDR_ANY);
-- srv.sin_port = htons (*port);
-- if (bind (msock, addr, sizeof (struct sockaddr_in)) < 0)
-+ if (bind (msock, addr, alen) < 0)
- {
- CLOSE (msock);
- msock = -1;
-@@ -130,14 +215,28 @@
- DEBUGP (("Master socket fd %d bound.\n", msock));
- if (!*port)
- {
-- size_t addrlen = sizeof (struct sockaddr_in);
-- if (getsockname (msock, addr, (int *)&addrlen) < 0)
-+ int addrlen;
-+#ifdef INET6
-+ addrlen = sizeof (ss);
-+#else
-+ addrlen = sizeof (sin);
-+#endif
-+ if (getsockname (msock, addr, &addrlen) < 0)
- {
- CLOSE (msock);
- msock = -1;
- return CONPORTERR;
- }
-- *port = ntohs (srv.sin_port);
-+ switch (addr->sa_family) {
-+ case AF_INET:
-+ *port = ntohs (((struct sockaddr_in *)srv)->sin_port);
-+ break;
-+#ifdef INET6
-+ case AF_INET6:
-+ *port = ntohs (((struct sockaddr_in6 *)srv)->sin6_port);
-+ break;
-+#endif
-+ }
- }
- if (listen (msock, 1) < 0)
- {
-@@ -146,6 +245,12 @@
- return LISTENERR;
- }
- return BINDOK;
-+}
-+
-+uerr_t
-+bindport (unsigned short *port)
-+{
-+ return bindport_af (port, AF_INET);
- }
-
- #ifdef HAVE_SELECT
-diff -urN wget-1.5.3.org/src/connect.h wget-1.5.3/src/connect.h
---- wget-1.5.3.org/src/connect.h Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/connect.h Sat Dec 16 11:45:15 2000
-@@ -22,6 +22,7 @@
-
- /* Function declarations */
- uerr_t make_connection PARAMS ((int *, char *, unsigned short));
-+uerr_t bindport_af PARAMS ((unsigned short *, int));
- uerr_t bindport PARAMS ((unsigned short *));
- uerr_t acceptport PARAMS ((int *));
- void closeport PARAMS ((int));
-diff -urN wget-1.5.3.org/src/ftp-basic.c wget-1.5.3/src/ftp-basic.c
---- wget-1.5.3.org/src/ftp-basic.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/ftp-basic.c Sat Dec 16 11:45:15 2000
-@@ -31,6 +31,11 @@
- # include <unistd.h>
- #endif
- #include <sys/types.h>
-+#ifdef INET6
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <netdb.h>
-+#endif
-
- #ifdef WINDOWS
- # include <winsock.h>
-@@ -345,6 +350,147 @@
- free (respline);
- return FTPOK;
- }
-+
-+#ifdef INET6
-+/* Bind a port and send the appropriate EPSV command to the FTP
-+ server. Use acceptport after RETR, to get the socket of data
-+ connection. */
-+uerr_t
-+ftp_eprt (struct rbuf *rbuf)
-+{
-+ uerr_t err;
-+ char *request, *respline, *bytes;
-+ unsigned char *in_addr;
-+ int nwritten;
-+ unsigned short port;
-+ struct sockaddr_storage ss;
-+ int sslen;
-+ char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
-+ int af;
-+
-+ /* Get the address of this side of the connection. */
-+ sslen = sizeof(ss);
-+ if (getsockname(RBUF_FD (rbuf), (struct sockaddr *)&ss, &sslen) < 0)
-+ return HOSTERR;
-+ /* Construct the argument of EPSV. */
-+ if (getnameinfo((struct sockaddr *)&ss, sslen, hbuf, sizeof(hbuf),
-+ NULL, 0, NI_NUMERICHOST) != 0)
-+ {
-+ return HOSTERR;
-+ }
-+ /* Setting port to 0 lets the system choose a free port. */
-+ port = 0;
-+ /* Bind the port. */
-+ err = bindport_af (&port, ((struct sockaddr *)&ss)->sa_family);
-+ if (err != BINDOK)
-+ return err;
-+ sprintf(pbuf, "%u", port);
-+ switch (((struct sockaddr *)&ss)->sa_family) {
-+ case AF_INET:
-+ af = 1;
-+ break;
-+ case AF_INET6:
-+ af = 2;
-+ break;
-+ default:
-+ af = 0; /*XXX*/
-+ break;
-+ }
-+ bytes = (char *)alloca (1 + strlen(hbuf) + strlen(pbuf) + 4 + 1);
-+ sprintf (bytes, "|%d|%s|%s|", af, hbuf, pbuf);
-+ /* Send EPRT request. */
-+ request = ftp_request ("EPRT", bytes);
-+ nwritten = iwrite (RBUF_FD (rbuf), request, strlen (request));
-+ if (nwritten < 0)
-+ {
-+ free (request);
-+ return WRITEFAILED;
-+ }
-+ free (request);
-+ /* Get appropriate response. */
-+ err = ftp_response (rbuf, &respline);
-+ if (err != FTPOK)
-+ {
-+ free (respline);
-+ return err;
-+ }
-+ if (*respline != '2')
-+ {
-+ free (respline);
-+ return FTPPORTERR;
-+ }
-+ free (respline);
-+ return FTPOK;
-+}
-+
-+/* Similar to ftp_eprt, but uses `EPSV' to initiate the passive FTP
-+ transfer. Reads the response from server and parses it. Reads the
-+ host and port addresses and returns them. */
-+uerr_t
-+ftp_epsv (struct rbuf *rbuf, char *hbuf, int hlen, char *pbuf, int plen)
-+{
-+ char *request, *respline, *s;
-+ int nwritten, i;
-+ uerr_t err;
-+ struct sockaddr_storage ss;
-+ int sslen;
-+
-+ sslen = sizeof(ss);
-+ if (getpeername(RBUF_FD (rbuf), (struct sockaddr *)&ss, &sslen) < 0)
-+ return FTPINVPASV;
-+ if (getnameinfo((struct sockaddr *)&ss, sslen, hbuf, hlen, NULL, 0,
-+ NI_NUMERICHOST) != 0)
-+ {
-+ return FTPINVPASV;
-+ }
-+ if (plen < sizeof("65535") + 1)
-+ return FTPINVPASV;
-+
-+ /* Form the request. */
-+ request = ftp_request ("EPSV", NULL);
-+ /* And send it. */
-+ nwritten = iwrite (RBUF_FD (rbuf), request, strlen (request));
-+ if (nwritten < 0)
-+ {
-+ free (request);
-+ return WRITEFAILED;
-+ }
-+ free (request);
-+ /* Get the server response. */
-+ err = ftp_response (rbuf, &respline);
-+ if (err != FTPOK)
-+ {
-+ free (respline);
-+ return err;
-+ }
-+ if (strncmp(respline, "229", 3) != 0)
-+ {
-+ free (respline);
-+ return FTPNOPASV;
-+ }
-+ /* Parse the request. */
-+ s = respline;
-+ for (s += 4; *s && *s != '('; s++);
-+ if (!*s)
-+ {
-+ free (respline);
-+ return FTPINVPASV;
-+ }
-+ s++;
-+ if (s[0] && s[0] == s[1] && s[0] == s[2])
-+ s += 3;
-+ else
-+ {
-+ free (respline);
-+ return FTPINVPASV;
-+ }
-+
-+ snprintf(pbuf, plen, "%d", atoi(s));
-+
-+ free (respline);
-+ return FTPOK;
-+}
-+#endif
-
- /* Sends the TYPE request to the server. */
- uerr_t
-diff -urN wget-1.5.3.org/src/ftp.c wget-1.5.3/src/ftp.c
---- wget-1.5.3.org/src/ftp.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/ftp.c Sat Dec 16 11:45:15 2000
-@@ -339,9 +339,50 @@
- {
- if (opt.ftp_pasv)
- {
-+#ifdef INET6
-+ char tportstr[10];
-+#endif
- char thost[256];
- unsigned short tport;
-
-+#ifdef INET6
-+ if (!opt.server_response)
-+ logputs (LOG_VERBOSE, "==> PASV ... ");
-+ err = ftp_epsv (&con->rbuf, thost, sizeof(thost), tportstr, sizeof(tportstr));
-+ /* FTPRERR, WRITEFAILED, FTPNOPASV, FTPINVPASV */
-+ switch (err)
-+ {
-+ case FTPRERR:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET, _("\
-+Error in server response, closing control connection.\n"));
-+ break;
-+ case WRITEFAILED:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET,
-+ _("Write failed, closing control connection.\n"));
-+ break;
-+ case FTPNOPASV:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET, _("Cannot initiate EPSV transfer.\n"));
-+ break;
-+ case FTPINVPASV:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET, _("Cannot parse EPSV response.\n"));
-+ break;
-+ case FTPOK:
-+ /* fine and dandy */
-+ break;
-+ default:
-+ abort ();
-+ break;
-+ }
-+ if (err==FTPOK)
-+ {
-+ tport = atoi(tportstr);
-+ goto pasvok;
-+ }
-+#endif
- if (!opt.server_response)
- logputs (LOG_VERBOSE, "==> PASV ... ");
- err = ftp_pasv (&con->rbuf, pasv_addr);
-@@ -384,6 +425,7 @@
- sprintf (thost, "%d.%d.%d.%d",
- pasv_addr[0], pasv_addr[1], pasv_addr[2], pasv_addr[3]);
- tport = (pasv_addr[4] << 8) + pasv_addr[5];
-+ pasvok:
- DEBUGP ((_("Will try connecting to %s:%hu.\n"), thost, tport));
- err = make_connection (&dtsock, thost, tport);
- switch (err)
-@@ -435,6 +477,52 @@
-
- if (!passive_mode_open) /* Try to use a port command if PASV failed */
- {
-+#ifdef INET6
-+ if (!opt.server_response)
-+ logputs (LOG_VERBOSE, "==> PORT ... ");
-+ err = ftp_eprt (&con->rbuf);
-+ /* FTPRERR, WRITEFAILED, bindport (CONSOCKERR, CONPORTERR, BINDERR,
-+ LISTENERR), HOSTERR, FTPPORTERR */
-+ switch (err)
-+ {
-+ case FTPRERR:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET, _("\
-+Error in server response, closing control connection.\n"));
-+ break;
-+ case WRITEFAILED:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET,
-+ _("Write failed, closing control connection.\n"));
-+ break;
-+ case CONSOCKERR:
-+ logputs (LOG_VERBOSE, "\n");
-+ logprintf (LOG_NOTQUIET, "socket: %s\n", strerror (errno));
-+ break;
-+ case CONPORTERR: case BINDERR: case LISTENERR:
-+ /* What now? These problems are local... */
-+ logputs (LOG_VERBOSE, "\n");
-+ logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"),
-+ strerror (errno));
-+ closeport (dtsock);
-+ break;
-+ case HOSTERR:
-+ logputs (LOG_VERBOSE, "\n");
-+ logprintf (LOG_NOTQUIET, "%s: %s\n", u->host,
-+ herrmsg (h_errno));
-+ break;
-+ case FTPPORTERR:
-+ logputs (LOG_VERBOSE, "\n");
-+ logputs (LOG_NOTQUIET, _("Invalid EPRT.\n"));
-+ break;
-+ case FTPOK:
-+ /* fine and dandy */
-+ goto portok;
-+ default:
-+ abort ();
-+ break;
-+ } /* port switch */
-+#endif
- if (!opt.server_response)
- logputs (LOG_VERBOSE, "==> PORT ... ");
- err = ftp_port (&con->rbuf);
-@@ -500,6 +588,7 @@
- abort ();
- break;
- } /* port switch */
-+ portok:
- if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
- } /* dtsock == -1 */
-@@ -1192,7 +1281,7 @@
- else if (f->tstamp == -1)
- logprintf (LOG_NOTQUIET, _("%s: corrupt time-stamp.\n"), u->local);
-
-- if (f->perms && dlthis)
-+ if (f->perms && f->type == FT_PLAINFILE && dlthis)
- chmod (u->local, f->perms);
- else
- DEBUGP (("Unrecognized permissions for %s.\n", u->local));
-diff -urN wget-1.5.3.org/src/ftp.h wget-1.5.3/src/ftp.h
---- wget-1.5.3.org/src/ftp.h Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/ftp.h Sat Dec 16 11:45:15 2000
-@@ -25,6 +25,10 @@
- uerr_t ftp_login PARAMS ((struct rbuf *, const char *, const char *));
- uerr_t ftp_port PARAMS ((struct rbuf *));
- uerr_t ftp_pasv PARAMS ((struct rbuf *, unsigned char *));
-+#ifdef INET6
-+uerr_t ftp_eprt PARAMS ((struct rbuf *));
-+uerr_t ftp_epsv PARAMS ((struct rbuf *, char *, int, char *, int));
-+#endif
- uerr_t ftp_type PARAMS ((struct rbuf *, int));
- uerr_t ftp_cwd PARAMS ((struct rbuf *, const char *));
- uerr_t ftp_retr PARAMS ((struct rbuf *, const char *));
-diff -urN wget-1.5.3.org/src/host.c wget-1.5.3/src/host.c
---- wget-1.5.3.org/src/host.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/host.c Sat Dec 16 11:45:15 2000
-@@ -75,12 +75,58 @@
- static struct host *add_hlist PARAMS ((struct host *, const char *,
- const char *, int));
-
-+#ifdef INET6
-+/*
-+ * The same as gethostbyname2, but supports internet addresses of the
-+ * form `N.N.N.N' and 'X:X:X:X:X:X:X:X'.
-+ *
-+ * Return the pointer of struct hostent on successful finding of the
-+ * hostname, NULL pointer otherwise.
-+ */
-+struct hostent *
-+ngethostbyname2 (const char *name, int af)
-+{
-+ struct hostent *hp = (struct hostent *) NULL;
-+ char *addr;
-+ size_t socksize;
-+
-+ /* Support only 2 types address family */
-+ if (af != AF_INET6 && af != AF_INET)
-+ return (struct hostent *) NULL;
-+
-+ hp = gethostbyname2(name, af);
-+ if (!hp) {
-+ if (inet_pton(af, name, addr) != -1) {
-+ switch (af) {
-+ case AF_INET:
-+ socksize = sizeof (struct sockaddr_in);
-+ break;
-+ case AF_INET6:
-+ socksize = sizeof (struct sockaddr_in6);
-+ break;
-+ }
-+ hp = gethostbyaddr(addr, socksize, af);
-+ }
-+ }
-+ return hp;
-+}
-+#endif /* INET6 */
-+
- /* The same as gethostbyname, but supports internet addresses of the
- form `N.N.N.N'. */
- struct hostent *
- ngethostbyname (const char *name)
- {
- struct hostent *hp;
-+#ifdef INET6
-+ const int af[] = { AF_INET, AF_INET6 };
-+ int i;
-+
-+ for (i = 0; i < 2; i++)
-+ if ((hp = ngethostbyname2(name, af[i])) != NULL)
-+ return hp;
-+ return (struct hostent *) NULL;
-+#else
- unsigned long addr;
-
- addr = (unsigned long)inet_addr (name);
-@@ -89,6 +135,7 @@
- else
- hp = gethostbyname (name);
- return hp;
-+#endif
- }
-
- /* Search for HOST in the linked list L, by hostname. Return the
-@@ -117,11 +164,159 @@
- return NULL;
- }
-
--/* Store the address of HOSTNAME, internet-style, to WHERE. First
-- check for it in the host list, and (if not found), use
-- ngethostbyname to get it.
-+#ifdef INET6
-+int
-+convert_hostaddress(int af, const char *hostname, void *address)
-+{
-+ struct host *t;
-+ int valid;
-+
-+ valid = inet_pton(af, hostname, address);
-+ if (valid == -1 || valid == 0) {
-+ /* If it is not of that form, try to find it in the cache. */
-+ t = search_host (hlist, hostname);
-+ if (t)
-+ valid = inet_pton(af, t->realname, address);
-+ if (valid != -1 && valid != 0)
-+ return 1;
-+ } else
-+ return 1;
-+ return 0;
-+}
-+
-+/*
-+ * Store the address of HOSTNAME, internet-style, to WHERE. First
-+ * check for it in the host list, and (if not found), use
-+ * ngethostbyname to get it.
-+ *
-+ * Return 1 on successful finding of the hostname, 0 otherwise.
-+ */
-+int
-+store_hostaddress (struct sockaddr *where, const char *hostname)
-+{
-+ struct host *t;
-+ struct addrinfo hints, *res;
-+ union {
-+ struct in_addr in;
-+ struct in6_addr in6;
-+ } addr_un;
-+ struct sockaddr_in *sin;
-+ struct sockaddr_in6 *sin6;
-+ char *addr_s;
-+ char addr_st[INET6_ADDRSTRLEN];
-+ int af, valid ,i, err;
-+ int family;
-+ const int afs[] = { AF_INET6, AF_INET };
-+#define MAX_AF 2
-
-- Return 1 on successful finding of the hostname, 0 otherwise. */
-+ if (opt.inet)
-+ family = AF_INET;
-+ else if (opt.inet6)
-+ family = AF_INET6;
-+ else
-+ family = 0;
-+ /*
-+ * If the address is of the form d.d.d.d, there will be no trouble
-+ * with it.
-+ */
-+ if (!family) {
-+ for (i = 0; i < MAX_AF; i++) {
-+ valid = convert_hostaddress(afs[i], hostname, &addr_un);
-+ af = afs[i];
-+ }
-+ } else {
-+ valid = convert_hostaddress(family, hostname, &addr_un);
-+ af = family;
-+ }
-+ /* If we have the numeric address, just store it. */
-+ if (valid) {
-+ /* This works on both little and big endian architecture, as
-+ * inet_addr returns the address in the proper order. It
-+ * appears to work on 64-bit machines too.
-+ */
-+ switch (af) {
-+ case AF_INET:
-+ sin = (struct sockaddr_in *) where;
-+ memcpy(&sin->sin_addr, &addr_un.in, sizeof(struct in_addr));
-+ sin->sin_family = AF_INET;
-+ return 1;
-+ case AF_INET6:
-+ sin6 = (struct sockaddr_in6 *) where;
-+ memcpy(&sin6->sin6_addr, &addr_un.in6, sizeof(struct in6_addr));
-+ sin6->sin6_family = AF_INET6;
-+ return 1;
-+ default:
-+ return 0;
-+ }
-+ }
-+ /*
-+ * Since all else has failed, let's try gethostbyname2(). Note that
-+ * we use gethostbyname2() rather than ngethostbyname2(), because we
-+ * *know* the address is not numerical.
-+ */
-+ bzero(&hints, sizeof(hints));
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ if (!family) {
-+ hints.ai_family = AF_UNSPEC;
-+ } else {
-+ hints.ai_family = family;
-+ }
-+ err = getaddrinfo(hostname, NULL, &hints, &res);
-+ if (err) {
-+ fprintf(stderr, "%s: %s\n", hostname, gai_strerror(err));
-+ return 0;
-+ }
-+ /*
-+ * Copy the address of the host to socket description.
-+ */
-+ switch (res->ai_family) {
-+ case AF_INET:
-+ sin = (struct sockaddr_in *) where;
-+ memcpy(&sin->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof (struct in_addr));
-+ sin->sin_family = AF_INET;
-+ memcpy (&addr_un.in.s_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof (addr_un.in));
-+ inet_ntop(AF_INET, &addr_un.in, addr_st, sizeof (struct in_addr));
-+ STRDUP_ALLOCA (addr_s, addr_st);
-+ freeaddrinfo(res);
-+ break;
-+ case AF_INET6:
-+ sin6 = (struct sockaddr_in6 *) where;
-+ memcpy(&sin6->sin6_addr, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, sizeof (struct in6_addr));
-+ sin6->sin6_family = AF_INET6;
-+ memcpy (&addr_un.in6, &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, sizeof (addr_un.in6));
-+ inet_ntop(AF_INET6, &addr_un.in6, addr_st, sizeof (struct in6_addr));
-+ STRDUP_ALLOCA (addr_s, addr_st);
-+ freeaddrinfo(res);
-+ break;
-+ default:
-+ freeaddrinfo(res);
-+ return 0;
-+ }
-+ /*
-+ * Now that we're here, we could as well cache the hostname for
-+ * future use, as in realhost(). First, we have to look for it by
-+ * address to know if it's already in the cache by another name.
-+ */
-+ /*
-+ * Originally, we copied to in.s_addr, but it appears to be missing
-+ * on some systems.
-+ */
-+ t = search_address (hlist, addr_s);
-+ if (t) /* Found in the list, as realname. */
-+ {
-+ /* Set the default, 0 quality. */
-+ hlist = add_hlist (hlist, hostname, addr_s, 0);
-+ return 1;
-+ }
-+ /* Since this is really the first time this host is encountered,
-+ * set quality to 1.
-+ */
-+ hlist = add_hlist (hlist, hostname, addr_s, 1);
-+ return 1;
-+}
-+#undef MAX_AF
-+#else /* INET6 */
- int
- store_hostaddress (unsigned char *where, const char *hostname)
- {
-@@ -131,8 +326,10 @@
- struct in_addr in;
- char *inet_s;
-
-- /* If the address is of the form d.d.d.d, there will be no trouble
-- with it. */
-+ /*
-+ * If the address is of the form d.d.d.d, there will be no trouble
-+ * with it.
-+ */
- addr = (unsigned long)inet_addr (hostname);
- if ((int)addr == -1)
- {
-@@ -178,6 +375,7 @@
- hlist = add_hlist (hlist, hostname, inet_s, 1);
- return 1;
- }
-+#endif /* INET6 */
-
- /* Add a host to the host list. The list is sorted by addresses. For
- equal addresses, the entries with quality should bubble towards the
-diff -urN wget-1.5.3.org/src/host.h wget-1.5.3/src/host.h
---- wget-1.5.3.org/src/host.h Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/host.h Sat Dec 16 11:45:54 2000
-@@ -20,13 +20,20 @@
- #ifndef HOST_H
- #define HOST_H
-
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+
- struct urlinfo;
-
- /* Function declarations */
-
- struct hostent *ngethostbyname PARAMS ((const char *));
-+#ifdef INET6
-+struct sockaddr;
-+int store_hostaddress PARAMS ((struct sockaddr *, const char *));
-+#else
- int store_hostaddress PARAMS ((unsigned char *, const char *));
--
-+#endif
- void clean_hosts PARAMS ((void));
-
- char *realhost PARAMS ((const char *));
-diff -urN wget-1.5.3.org/src/init.c wget-1.5.3/src/init.c
---- wget-1.5.3.org/src/init.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/init.c Sat Dec 16 11:45:15 2000
-@@ -114,6 +114,8 @@
- { "httpuser", &opt.http_user, cmd_string },
- { "ignorelength", &opt.ignore_length, cmd_boolean },
- { "includedirectories", &opt.includes, cmd_directory_vector },
-+ { "inet", &opt.inet, cmd_boolean },
-+ { "inet6", &opt.inet6, cmd_boolean },
- { "input", &opt.input_filename, cmd_string },
- { "killlonger", &opt.kill_longer, cmd_boolean },
- { "logfile", &opt.lfilename, cmd_string },
-diff -urN wget-1.5.3.org/src/main.c wget-1.5.3/src/main.c
---- wget-1.5.3.org/src/main.c Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/main.c Sat Dec 16 11:45:15 2000
-@@ -111,7 +111,7 @@
- print_usage ();
- /* Had to split this in parts, so the #@@#%# Ultrix compiler and cpp
- don't bitch. Also, it makes translation much easier. */
-- printf ("%s%s%s%s%s%s%s%s%s%s", _("\
-+ printf ("%s%s%s%s%s%s%s%s%s%s%s%s", _("\
- \n\
- Mandatory arguments to long options are mandatory for short options too.\n\
- \n"), _("\
-@@ -144,7 +144,16 @@
- -w, --wait=SECONDS wait SECONDS between retrievals.\n\
- -Y, --proxy=on/off turn proxy on or off.\n\
- -Q, --quota=NUMBER set retrieval quota to NUMBER.\n\
--\n"), _("\
-+"),
-+#ifdef INET6
-+_("\
-+ --inet use IP version 4 socket.\n\
-+ --inet6 use IP version 6 socket.\n\
-+\n"),
-+#else
-+_("\n"),
-+#endif /* INET6 */
-+_("\
- Directories:\n\
- -nd --no-directories don\'t create directories.\n\
- -x, --force-directories force creation of directories.\n\
-@@ -157,6 +166,8 @@
- --http-passwd=PASS set http password to PASS.\n\
- -C, --cache=on/off (dis)allow server-cached data (normally allowed).\n\
- --ignore-length ignore `Content-Length\' header field.\n\
-+"),
-+_("\
- --header=STRING insert STRING among the headers.\n\
- --proxy-user=USER set USER as proxy username.\n\
- --proxy-passwd=PASS set PASS as proxy password.\n\
-@@ -195,7 +206,7 @@
- main (int argc, char *const *argv)
- {
- char **url, **t;
-- int i, c, nurl, status, append_to_log;
-+ int i, c, nurl, status, append_to_log, af;
-
- static struct option long_options[] =
- {
-@@ -211,6 +222,10 @@
- { "force-html", no_argument, NULL, 'F'},
- { "help", no_argument, NULL, 'h' },
- { "ignore-length", no_argument, NULL, 10 },
-+#ifdef INET6
-+ { "inet", no_argument, NULL, '4' },
-+ { "inet6", no_argument, NULL, '6' },
-+#endif
- { "mirror", no_argument, NULL, 'm' },
- { "no-clobber", no_argument, NULL, 13 },
- { "no-directories", no_argument, NULL, 19 },
-@@ -334,6 +349,14 @@
- case 22:
- setval ("simplehostcheck", "on");
- break;
-+#ifdef INET6
-+ case '4':
-+ setval ("inet", "on");
-+ break;
-+ case '6':
-+ setval ("inet6", "on");
-+ break;
-+#endif
- case 'b':
- setval ("background", "on");
- break;
-@@ -572,6 +595,13 @@
- print_usage ();
- exit (1);
- }
-+
-+ if (opt.inet && opt.inet6) {
-+ printf (_("Can't inet and inet6 be specified at the same time.\n"));
-+ print_usage ();
-+ exit (1);
-+ }
-+
- if (opt.timestamping && opt.noclobber)
- {
- printf (_("\
-diff -urN wget-1.5.3.org/src/options.h wget-1.5.3/src/options.h
---- wget-1.5.3.org/src/options.h Sat Dec 16 11:43:37 2000
-+++ wget-1.5.3/src/options.h Sat Dec 16 11:45:15 2000
-@@ -30,6 +30,8 @@
- data than specified in
- content-length? */
- int ignore_length; /* Do we heed content-length at all? */
-+ int inet;
-+ int inet6;
- int recursive; /* Are we recursive? */
- int spanhost; /* Do we span across hosts in
- recursion? */
+++ /dev/null
-diff -Nru wget-1.5.2/configure wget-1.5.2.new/configure
---- wget-1.5.2/configure Tue Jun 23 23:36:31 1998
-+++ wget-1.5.2.new/configure Fri Sep 11 05:43:21 1998
-@@ -2345,7 +2345,7 @@
-
- fi
-
--ALL_LINGUAS="cs de hr no it pt_BR"
-+ALL_LINGUAS="cs de hr no it pl pt_BR"
-
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
- echo "configure:2352: checking whether NLS is requested" >&5
-diff -Nru wget-1.5.2/configure.in wget-1.5.2.new/configure.in
---- wget-1.5.2/configure.in Tue Jun 23 23:27:57 1998
-+++ wget-1.5.2.new/configure.in Fri Sep 11 05:43:21 1998
-@@ -183,7 +183,7 @@
- dnl #### This kind of sucks. Shouldn't the configure process
- dnl determine this automagically by scanning `.po' files in `po/'
- dnl subdirectory?
--ALL_LINGUAS="cs de hr no it pt_BR"
-+ALL_LINGUAS="cs de hr no it pl pt_BR"
-
- dnl internationalization macros
- WGET_WITH_NLS
-diff -Nru wget-1.5.2/po/pl.po wget-1.5.2.new/po/pl.po
---- wget-1.5.2/po/pl.po Thu Jan 1 01:00:00 1970
-+++ wget-1.5.2.new/po/pl.po Tue Sep 8 22:42:01 1998
-@@ -0,0 +1,1050 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) YEAR Free Software Foundation, Inc.
-+# Adam Kozubowicz <tapir@interdata.com.pl>, 1998.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: wget \n"
-+"POT-Creation-Date: 1998-05-05 08:56+0200\n"
-+"PO-Revision-Date: 1998-08-24 21:10+0200\n"
-+"Last-Translator: Adam Kozubowicz <tapir@interdata.com.pl>\n"
-+"Language-Team: Polish <pl@li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-2\n"
-+"Content-Transfer-Encoding: 8-bit\n"
-+
-+#. Login to the server:
-+#. First: Establish the control connection.
-+#: src/ftp.c:146 src/http.c:335
-+#, c-format
-+msgid "Connecting to %s:%hu... "
-+msgstr "£±czê z %s:%hu... "
-+
-+#: src/ftp.c:168 src/ftp.c:409 src/http.c:352
-+#, c-format
-+msgid "Connection to %s:%hu refused.\n"
-+msgstr "Po³±czenie z %s:%hu odrzucone.\n"
-+
-+#. Second: Login with proper USER/PASS sequence.
-+#: src/ftp.c:189 src/http.c:363
-+msgid "connected!\n"
-+msgstr "po³±czone!\n"
-+
-+#: src/ftp.c:190
-+#, c-format
-+msgid "Logging in as %s ... "
-+msgstr "Logujê siê jako %s ..."
-+
-+#: src/ftp.c:199 src/ftp.c:251 src/ftp.c:299 src/ftp.c:351 src/ftp.c:445
-+#: src/ftp.c:518 src/ftp.c:566 src/ftp.c:614
-+msgid "Error in server response, closing control connection.\n"
-+msgstr "B³±d w odpowiedzi serwera, zamykam po³±czenie.\n"
-+
-+#: src/ftp.c:207
-+msgid "Error in server greeting.\n"
-+msgstr "B³±d przy powitaniu serwera.\n"
-+
-+#: src/ftp.c:214 src/ftp.c:260 src/ftp.c:308 src/ftp.c:360 src/ftp.c:455
-+#: src/ftp.c:528 src/ftp.c:576 src/ftp.c:624
-+msgid "Write failed, closing control connection.\n"
-+msgstr "B³±d przy zapisie, zamykam po³±czenie.\n"
-+
-+#: src/ftp.c:221
-+msgid "The server refuses login.\n"
-+msgstr "Serwer odmawia logowania.\n"
-+
-+#: src/ftp.c:228
-+msgid "Login incorrect.\n"
-+msgstr "Nieprawid³owy login.\n"
-+
-+#: src/ftp.c:235
-+msgid "Logged in!\n"
-+msgstr "Zalogowany|\n"
-+
-+#: src/ftp.c:268
-+#, c-format
-+msgid "Unknown type `%c', closing control connection.\n"
-+msgstr "Nieznany rodzaj `%c', zamykam po³±czenie.\n"
-+
-+#: src/ftp.c:281
-+msgid "done. "
-+msgstr "zrobione."
-+
-+#: src/ftp.c:287
-+msgid "==> CWD not needed.\n"
-+msgstr "==> nie potrzeba CWD.\n"
-+
-+#: src/ftp.c:315
-+#, c-format
-+msgid ""
-+"No such directory `%s'.\n"
-+"\n"
-+msgstr "Katalog `%s' nie istnieje.\n"
-+"\n"
-+
-+#: src/ftp.c:329 src/ftp.c:597 src/ftp.c:645 src/url.c:1421
-+msgid "done.\n"
-+msgstr "zrobione.\n"
-+
-+#. do not CWD
-+#: src/ftp.c:333
-+msgid "==> CWD not required.\n"
-+msgstr "==> CWD nie wymagane.\n"
-+
-+#: src/ftp.c:367
-+msgid "Cannot initiate PASV transfer.\n"
-+msgstr "Nie mogê zainicjowaæ transferu PASV.\n"
-+
-+#: src/ftp.c:371
-+msgid "Cannot parse PASV response.\n"
-+msgstr "Nie mogê zanalizowaæ odpowiedzi PASV.\n"
-+
-+#: src/ftp.c:385
-+#, c-format
-+msgid "Will try connecting to %s:%hu.\n"
-+msgstr "Bêdê próbowa³ po³±czenia z %s:%hu.\n"
-+
-+#: src/ftp.c:472
-+#, c-format
-+msgid "Bind error (%s).\n"
-+msgstr "B³±d powi±zania (%s).\n"
-+
-+#: src/ftp.c:488
-+msgid "Invalid PORT.\n"
-+msgstr "Nieprawid³owy PORT.\n"
-+
-+#: src/ftp.c:502 src/ftp.c:546
-+msgid "done. "
-+msgstr "zrobione."
-+
-+#: src/ftp.c:535
-+msgid ""
-+"\n"
-+"REST failed, starting from scratch.\n"
-+msgstr ""
-+"\n"
-+"REST nie udane, rozpoczynam od pocz±tku.\n"
-+
-+#: src/ftp.c:584
-+#, c-format
-+msgid ""
-+"No such file `%s'.\n"
-+"\n"
-+msgstr ""
-+"Plik `%s' nie istnieje.\n"
-+"\n"
-+
-+#: src/ftp.c:632
-+#, c-format
-+msgid ""
-+"No such file or directory `%s'.\n"
-+"\n"
-+msgstr ""
-+"Plik lub katalog `%s' nie istnieje.\n"
-+"\n"
-+
-+#: src/ftp.c:690 src/ftp.c:697
-+#, c-format
-+msgid "Length: %s"
-+msgstr "Wielko¶æ: %s"
-+
-+#: src/ftp.c:692 src/ftp.c:699
-+#, c-format
-+msgid " [%s to go]"
-+msgstr " [%s do koñca]"
-+
-+#: src/ftp.c:701
-+msgid " (unauthoritative)\n"
-+msgstr " (nieautoryzowane)\n"
-+
-+#: src/ftp.c:719
-+#, c-format
-+msgid "%s: %s, closing control connection.\n"
-+msgstr "%s: %s, zamykam po³±czenie.\n"
-+
-+#: src/ftp.c:727
-+#, c-format
-+msgid "%s (%s) - Data connection: %s; "
-+msgstr "%s (%s) - Po³±czenie danych: %s; "
-+
-+#: src/ftp.c:744
-+msgid "Control connection closed.\n"
-+msgstr "Po³±czenie zamkniête.\n"
-+
-+#: src/ftp.c:762
-+msgid "Data transfer aborted.\n"
-+msgstr "Przerwany transfer danych.\n"
-+
-+#: src/ftp.c:828
-+#, c-format
-+msgid "File `%s' already there, not retrieving.\n"
-+msgstr "Plik `%s' ju¿ istnieje, nie ¶ci±gam.\n"
-+
-+#: src/ftp.c:894 src/http.c:911
-+#, c-format
-+msgid "(try:%2d)"
-+msgstr "(próba:%2d)"
-+
-+#: src/ftp.c:953 src/http.c:1097
-+#, c-format
-+msgid ""
-+"%s (%s) - `%s' saved [%ld]\n"
-+"\n"
-+msgstr ""
-+"%s (%s) - `%s' zapisane [%ld]\n"
-+
-+#: src/ftp.c:999
-+#, c-format
-+msgid "Using `%s' as listing tmp file.\n"
-+msgstr "U¿ywam `%s' jako tymczasowego listingu.\n"
-+
-+#: src/ftp.c:1011
-+#, c-format
-+msgid "Removed `%s'.\n"
-+msgstr "Usuniête `%s'.\n"
-+
-+#: src/ftp.c:1047
-+#, c-format
-+msgid "Recursion depth %d exceeded max. depth %d.\n"
-+msgstr "G³êboko¶æ rekurencji %d przekroczy³a maksymalny poziom %d.\n"
-+
-+#: src/ftp.c:1094 src/http.c:1035
-+#, c-format
-+msgid ""
-+"Local file `%s' is more recent, not retrieving.\n"
-+"\n"
-+msgstr ""
-+"Lokalny plik `%s' jest nowszy, nie ¶ci±gam.\n"
-+"\n"
-+
-+#: src/ftp.c:1100 src/http.c:1041
-+#, c-format
-+msgid "The sizes do not match (local %ld), retrieving.\n"
-+msgstr "Pliki s± ró¿nej d³ugo¶ci (lokalny %ld), ¶ci±gam.\n"
-+
-+#: src/ftp.c:1117
-+msgid "Invalid name of the symlink, skipping.\n"
-+msgstr "B³êdna nazwa dowi±zania symbolicznego (symlink), pomijam.\n"
-+
-+#: src/ftp.c:1134
-+#, c-format
-+msgid ""
-+"Already have correct symlink %s -> %s\n"
-+"\n"
-+msgstr ""
-+"Istnieje ju¿ prawid³owe dowi±zanie symboliczne (symlink) %s -> %s\n"
-+"\n"
-+
-+#: src/ftp.c:1141
-+#, c-format
-+msgid "Creating symlink %s -> %s\n"
-+msgstr "Tworzê dowi±zanie symboliczne (symlink) %s -> %s\n"
-+
-+#: src/ftp.c:1152
-+#, c-format
-+msgid "Symlinks not supported, skipping symlink `%s'.\n"
-+msgstr "Dowi±zania symboliczne (symlink) nie obs³ugiwane, pomijam dowi±zanie `%s'.\n"
-+
-+#: src/ftp.c:1164
-+#, c-format
-+msgid "Skipping directory `%s'.\n"
-+msgstr "Pomijam katalog `%s'.\n"
-+
-+#: src/ftp.c:1173
-+#, c-format
-+msgid "%s: unknown/unsupported file type.\n"
-+msgstr "%s: nieznany/nieobs³ugiwany format pliku.\n"
-+
-+#: src/ftp.c:1189
-+#, c-format
-+msgid "%s: corrupt time-stamp.\n"
-+msgstr "%s: b³êdny czas/data (time-stamp) pliku.\n"
-+
-+#: src/ftp.c:1209
-+#, c-format
-+msgid "Will not retrieve dirs since depth is %d (max %d).\n"
-+msgstr "Nie mogê ¶ci±gaæ katalogów dopóki ich g³êboko¶æ wynosi %d (max %d).\n"
-+
-+#: src/ftp.c:1248
-+#, c-format
-+msgid "Not descending to `%s' as it is excluded/not-included.\n"
-+msgstr "Nie schodzê do `%s', poniewa¿ jest excluded/not-included.\n"
-+
-+#: src/ftp.c:1293
-+#, c-format
-+msgid "Rejecting `%s'.\n"
-+msgstr "Odrzucam `%s'.\n"
-+
-+#. No luck.
-+#. #### This message SUCKS. We should see what was the
-+#. reason that nothing was retrieved.
-+#: src/ftp.c:1340
-+#, c-format
-+msgid "No matches on pattern `%s'.\n"
-+msgstr "Nic nie pasuje do wzorca `%s'.\n"
-+
-+#: src/ftp.c:1400
-+#, c-format
-+msgid "Wrote HTML-ized index to `%s' [%ld].\n"
-+msgstr "Zapisa³em index (HTML) do `%s' [%ld].\n"
-+
-+#: src/ftp.c:1405
-+#, c-format
-+msgid "Wrote HTML-ized index to `%s'.\n"
-+msgstr "Zapisa³em index (HTML) do `%s'.\n"
-+
-+#: src/getopt.c:454
-+#, c-format
-+msgid "%s: option `%s' is ambiguous\n"
-+msgstr "%s: opcja `%s' jest niejednoznaczna\n"
-+
-+#: src/getopt.c:478
-+#, c-format
-+msgid "%s: option `--%s' doesn't allow an argument\n"
-+msgstr "%s: opcja `--%s' nie dopuszcza argumentu\n"
-+
-+#: src/getopt.c:483
-+#, c-format
-+msgid "%s: option `%c%s' doesn't allow an argument\n"
-+msgstr "%s: opcja `%c%s' nie dopuszcza argumentu\n"
-+
-+#: src/getopt.c:498
-+#, c-format
-+msgid "%s: option `%s' requires an argument\n"
-+msgstr "%s: opcja `%s' wymaga argumentu\n"
-+
-+#. --option
-+#: src/getopt.c:528
-+#, c-format
-+msgid "%s: unrecognized option `--%s'\n"
-+msgstr "%s: nierozpoznana opcja `--%s'\n"
-+
-+#. +option or -option
-+#: src/getopt.c:532
-+#, c-format
-+msgid "%s: unrecognized option `%c%s'\n"
-+msgstr "%s: nierozpoznana opcja `%c%s'\n"
-+
-+#: src/getopt.c:557
-+#, c-format
-+msgid "%s: unrecognized option, character code 0%o\n"
-+msgstr "%s: nierozpoznana opcja, kod znaku 0%o\n"
-+
-+#: src/getopt.c:560
-+#, c-format
-+msgid "%s: unrecognized option `-%c'\n"
-+msgstr "%s: nierozpoznana opcja `-%c'\n"
-+
-+#. 1003.2 specifies the format of this message.
-+#: src/getopt.c:563
-+#, c-format
-+msgid "%s: illegal option -- %c\n"
-+msgstr "%s: nielegalna opcja -- %c\n"
-+
-+#: src/getopt.c:598
-+#, c-format
-+msgid "%s: option `-%c' requires an argument\n"
-+msgstr "%s: opcja `-%c' wymaga argumentu\n"
-+
-+#. 1003.2 specifies the format of this message.
-+#: src/getopt.c:602
-+#, c-format
-+msgid "%s: option requires an argument -- %c\n"
-+msgstr "%s: opcja wymaga argumentu -- %c\n"
-+
-+#: src/host.c:432
-+#, c-format
-+msgid "%s: Cannot determine user-id.\n"
-+msgstr "%s: Nie mogê okre¶liæ id u¿ytkownika.\n"
-+
-+#: src/host.c:444
-+#, c-format
-+msgid "%s: Warning: uname failed: %s\n"
-+msgstr "%s: Ostrze¿enie: Nie powiod³o siê wykonanie uname: %s\n"
-+
-+#: src/host.c:456
-+#, c-format
-+msgid "%s: Warning: gethostname failed\n"
-+msgstr "%s: Ostrze¿enie: Nie powiod³o sie wykonanie gethostname\n"
-+
-+#: src/host.c:484
-+#, c-format
-+msgid "%s: Warning: cannot determine local IP address.\n"
-+msgstr "%s: Ostrze¿enie: Nie mogê okre¶liæ lokalnego adresu IP.\n"
-+
-+#: src/host.c:498
-+#, c-format
-+msgid "%s: Warning: cannot reverse-lookup local IP address.\n"
-+msgstr "%s: Ostrze¿enie: Nie mogê wykonaæ reverse-lookup na lokalnym IP.\n"
-+
-+#: src/host.c:506
-+#, c-format
-+msgid "%s: Warning: reverse-lookup of local address did not yield FQDN!\n"
-+msgstr "%s: Ostrze¿enie: reverse-lookup lokalnego adresu nie odpowiada FQDN!\n"
-+
-+#: src/host.c:533
-+msgid "Host not found"
-+msgstr "Nie znaleziono hosta"
-+
-+#: src/host.c:535
-+msgid "Unknown error"
-+msgstr "Nieznany b³±d"
-+
-+#: src/html.c:433 src/html.c:435
-+#, c-format
-+msgid "Index of /%s on %s:%d"
-+msgstr "Indeks /%s na %s:%d"
-+
-+#: src/html.c:457
-+msgid "time unknown "
-+msgstr "nieznany czas "
-+
-+#: src/html.c:461
-+msgid "File "
-+msgstr "Plik "
-+
-+#: src/html.c:464
-+msgid "Directory "
-+msgstr "Katalog "
-+
-+#: src/html.c:467
-+msgid "Link "
-+msgstr "Link "
-+
-+#: src/html.c:470
-+msgid "Not sure "
-+msgstr "Nie pewny "
-+
-+#: src/html.c:488
-+#, c-format
-+msgid " (%s bytes)"
-+msgstr " (%s bajtów)"
-+
-+#: src/http.c:481
-+msgid "Failed writing HTTP request.\n"
-+msgstr "B³±d podczas ¿±dania HTTP.\n"
-+
-+#: src/http.c:486
-+#, c-format
-+msgid "%s request sent, awaiting response... "
-+msgstr "%s ¿±danie wys³ane, oczekujê odpowiedzi..."
-+
-+#: src/http.c:525
-+msgid "End of file while parsing headers.\n"
-+msgstr "Koniec pliku podczas analizowania nag³ówków.\n"
-+
-+#: src/http.c:536
-+#, c-format
-+msgid "Read error (%s) in headers.\n"
-+msgstr "B³±d odczytu (%s) w nag³ówkach.\n"
-+
-+#: src/http.c:576
-+msgid "No data received"
-+msgstr "Nie odebrano danych"
-+
-+#: src/http.c:578
-+msgid "Malformed status line"
-+msgstr "Niew³a¶ciwa linia statusu"
-+
-+#: src/http.c:583
-+msgid "(no description)"
-+msgstr "(brak opisu)"
-+
-+#. If we have tried it already, then there is not point
-+#. retrying it.
-+#: src/http.c:667
-+msgid "Authorization failed.\n"
-+msgstr "Nie powiod³a siê autoryzacja.\n"
-+
-+#: src/http.c:674
-+msgid "Unknown authentication scheme.\n"
-+msgstr "Nieznany schemat autentykacji.\n"
-+
-+#: src/http.c:737
-+#, c-format
-+msgid "Location: %s%s\n"
-+msgstr "Po³o¿enie: %s%s\n"
-+
-+#: src/http.c:738 src/http.c:763
-+msgid "unspecified"
-+msgstr "nieokre¶lone"
-+
-+#: src/http.c:739
-+msgid " [following]"
-+msgstr " [nastêpuj±ce]"
-+
-+#. No need to print this output if the body won't be
-+#. downloaded at all, or if the original server response is
-+#. printed.
-+#: src/http.c:753
-+msgid "Length: "
-+msgstr "Wielko¶æ: "
-+
-+#: src/http.c:758
-+#, c-format
-+msgid " (%s to go)"
-+msgstr " (%s do koñca)"
-+
-+#: src/http.c:763
-+msgid "ignored"
-+msgstr "zignorowane"
-+
-+#: src/http.c:846
-+msgid "Warning: wildcards not supported in HTTP.\n"
-+msgstr "Ostrze¿enie: maska (*.*) nie jest obs³ugiwana w HTTP.\n"
-+
-+#. If opt.noclobber is turned on and file already exists, do not
-+#. retrieve the file
-+#: src/http.c:861
-+#, c-format
-+msgid "File `%s' already there, will not retrieve.\n"
-+msgstr "Plik `%s' ju¿ istnieje, nie ¶ci±gam.\n"
-+
-+#: src/http.c:967
-+#, c-format
-+msgid "Cannot write to `%s' (%s).\n"
-+msgstr "Nie mogê pisaæ do `%s' (%s).\n"
-+
-+#: src/http.c:977
-+#, c-format
-+msgid "ERROR: Redirection (%d) without location.\n"
-+msgstr "B£¡D: Przekierowanie (%d) bez adresu.\n"
-+
-+#: src/http.c:993
-+#, c-format
-+msgid "%s ERROR %d: %s.\n"
-+msgstr "%s B£¡D %d: %s.\n"
-+
-+#: src/http.c:1005
-+msgid "Last-modified header missing -- time-stamps turned off.\n"
-+msgstr "Brak daty ostatniej modyfikacji -- wy³±czono time-stamps.\n"
-+
-+#: src/http.c:1013
-+msgid "Last-modified header invalid -- time-stamp ignored.\n"
-+msgstr "B³êdna data ostatniej modyfikacji -- ignorujê time-stamp.\n"
-+
-+#: src/http.c:1045
-+msgid "Remote file is newer, retrieving.\n"
-+msgstr "Odleg³y plik jest nowszy, ¶ci±gam.\n"
-+
-+#: src/http.c:1079
-+#, c-format
-+msgid ""
-+"%s (%s) - `%s' saved [%ld/%ld]\n"
-+"\n"
-+msgstr ""
-+"%s (%s) - `%s' zapisane [%ld/%ld]\n"
-+"\n"
-+
-+#: src/http.c:1111
-+#, c-format
-+msgid "%s (%s) - Connection closed at byte %ld. "
-+msgstr "%s (%s) - Po³±czenie zamkniête na bajcie %ld. "
-+
-+#: src/http.c:1119
-+#, c-format
-+msgid ""
-+"%s (%s) - `%s' saved [%ld/%ld])\n"
-+"\n"
-+msgstr ""
-+"%s (%s) - `%s' zapisane [%ld/%ld])\n"
-+"\n"
-+
-+#: src/http.c:1131
-+#, c-format
-+msgid "%s (%s) - Connection closed at byte %ld/%ld. "
-+msgstr "%s (%s) - Po³±czenie zamkniête na bajcie %ld/%ld. "
-+
-+#: src/http.c:1142
-+#, c-format
-+msgid "%s (%s) - Read error at byte %ld (%s)."
-+msgstr "%s (%s) - B³±d odczytu bajtu %ld (%s)."
-+
-+#: src/http.c:1150
-+#, c-format
-+msgid "%s (%s) - Read error at byte %ld/%ld (%s). "
-+msgstr "%s (%s) - B³±d odczytu bajtu %ld/%ld (%s). "
-+
-+#: src/init.c:311 src/netrc.c:246
-+#, c-format
-+msgid "%s: Cannot read %s (%s).\n"
-+msgstr "%s: Nie mogê odczytaæ %s (%s).\n"
-+
-+#: src/init.c:332 src/init.c:338
-+#, c-format
-+msgid "%s: Error in %s at line %d.\n"
-+msgstr "%s: B³±d w %s w linii %d.\n"
-+
-+#: src/init.c:369
-+#, c-format
-+msgid "%s: Warning: Both system and user wgetrc point to `%s'.\n"
-+msgstr "%s: Ostrze¿enie: wgetrc systemu i u¿ytkownika wskazuj± na `%s'.\n"
-+
-+#: src/init.c:460
-+#, c-format
-+msgid "%s: BUG: unknown command `%s', value `%s'.\n"
-+msgstr "%s: PLUSKWA: nieznane polecenie `%s', warto¶æ `%s'.\n"
-+
-+#: src/init.c:487
-+#, c-format
-+msgid "%s: %s: Please specify on or off.\n"
-+msgstr "%s: %s: Proszê podaæ on lub off.\n"
-+
-+#: src/init.c:505 src/init.c:762 src/init.c:784 src/init.c:857
-+#, c-format
-+msgid "%s: %s: Invalid specification `%s'.\n"
-+msgstr "%s: %s: B³êdna specyfikacja `%s'.\n"
-+
-+#: src/init.c:618 src/init.c:640 src/init.c:662 src/init.c:688
-+#, c-format
-+msgid "%s: Invalid specification `%s'\n"
-+msgstr "%s: B³êdna specyfikacja `%s'\n"
-+
-+#: src/main.c:101
-+#, c-format
-+msgid "Usage: %s [OPTION]... [URL]...\n"
-+msgstr "Opis: %s [OPCJA]... [URL]...\n"
-+
-+#: src/main.c:109
-+#, c-format
-+msgid "GNU Wget %s, a non-interactive network retriever.\n"
-+msgstr "GNU Wget %s, bezobs³ugowy ¶ci±gacz sieciowy :-).\n"
-+
-+#. Had to split this in parts, so the #@@#%# Ultrix compiler and cpp
-+#. don't bitch. Also, it makes translation much easier.
-+#: src/main.c:114
-+msgid ""
-+"\n"
-+"Mandatory arguments to long options are mandatory for short options too.\n"
-+"\n"
-+msgstr ""
-+"\n"
-+"Obowi±zkowe argumenty d³ugich opcji s± obowi±zkowe tak¿e dla opcji krótkich.\n"
-+"\n"
-+
-+#: src/main.c:117
-+msgid ""
-+"Startup:\n"
-+" -V, --version display the version of Wget and exit.\n"
-+" -h, --help print this help.\n"
-+" -b, --background go to background after startup.\n"
-+" -e, --execute=COMMAND execute a `.wgetrc' command.\n"
-+"\n"
-+msgstr ""
-+"Uruchomienie:\n"
-+" -V, --version wy¶wietla wersjê Wget-a i koñczy pracê.\n"
-+" -h, --help wy¶wietla t± pomoc.\n"
-+" -b, --background dzia³a w tle po uruchomieniu.\n"
-+" -e, --execute=POLECENIE wykonuje polecenia z pliku `.wgetrc'.\n"
-+"\n"
-+
-+#: src/main.c:123
-+msgid ""
-+"Logging and input file:\n"
-+" -o, --output-file=FILE log messages to FILE.\n"
-+" -a, --append-output=FILE append messages to FILE.\n"
-+" -d, --debug print debug output.\n"
-+" -q, --quiet quiet (no output).\n"
-+" -v, --verbose be verbose (this is the default).\n"
-+" -nv, --non-verbose turn off verboseness, without being quiet.\n"
-+" -i, --input-file=FILE read URL-s from file.\n"
-+" -F, --force-html treat input file as HTML.\n"
-+"\n"
-+msgstr ""
-+"Logowanie i plik wej¶ciowy:\n"
-+" -o, --output-file=PLIK zapisuje informacje do pliku PLIK.\n"
-+" -a, --append-output=PLIK dopisuje informacje do pliku PLIK.\n"
-+" -d, --debug wy¶wietla informacje do debugowania.\n"
-+" -q, --quiet praca ca³kowicie bez wy¶wietlania.\n"
-+" -v, --verbose praca z wy¶wietlaniem (normalnie w³±czone).\n"
-+" -nv, --non-verbose praca bez wy¶wietlania, ale nie jest cichy.\n"
-+" -i, --input-file=PLIK odczytuje URL-e z pliku PLIK.\n"
-+" -F, --force-html traktuje plik wej¶ciowy jako plik HTML.\n"
-+"\n"
-+
-+#: src/main.c:133
-+msgid ""
-+"Download:\n"
-+" -t, --tries=NUMBER set number of retries to NUMBER (0 "
-+"unlimits).\n"
-+" -O --output-document=FILE write documents to FILE.\n"
-+" -nc, --no-clobber don't clobber existing files.\n"
-+" -c, --continue restart getting an existing file.\n"
-+" --dot-style=STYLE set retrieval display style.\n"
-+" -N, --timestamping don't retrieve files if older than local.\n"
-+" -S, --server-response print server response.\n"
-+" --spider don't download anything.\n"
-+" -T, --timeout=SECONDS set the read timeout to SECONDS.\n"
-+" -w, --wait=SECONDS wait SECONDS between retrievals.\n"
-+" -Y, --proxy=on/off turn proxy on or off.\n"
-+" -Q, --quota=NUMBER set retrieval quota to NUMBER.\n"
-+"\n"
-+msgstr ""
-+"¦ci±ganie:\n"
-+" -t, --tries=LICZBA ustawia liczbê prób na LICZBA (0 "
-+"bez limitu).\n"
-+" -O, --output-document=PLIK zapisuje dokumenty do PLIK.\n"
-+" -nc, --no-clobber nie zastêpuje istniej±cych plików.\n"
-+" -c, --continue doci±gniêcie istniej±cych plików.\n"
-+" --dot-style=STYL ustawianie stylu wy¶wietlania.\n"
-+" -N, --timestamping ¶ciaga plik je¶li jest nowszy lub nie istniej±cy.\n"
-+" -S, --server-response wy¶wietla odpowiedzi serwera.\n"
-+" --spider nie ¶ci±ga niczego.\n"
-+" -T, --timeout=SEKUND ustawia czas odpowiedzi na SEKUND.\n"
-+" -w, --wait=SEKUND czeka SEKUND pomiêdzy ¶ci±ganiem.\n"
-+" -Y, --proxy=on/off w³±cza (on) lub wy³±cza (off) proxy.\n"
-+" -Q, --quota=LICZBA ustawia max ¶ci±ganych danych na LICZBA.\n"
-+"\n"
-+
-+#: src/main.c:147
-+msgid ""
-+"Directories:\n"
-+" -nd --no-directories don't create directories.\n"
-+" -x, --force-directories force creation of directories.\n"
-+" -nH, --no-host-directories don't create host directories.\n"
-+" -P, --directory-prefix=PREFIX save files to PREFIX/...\n"
-+" --cut-dirs=NUMBER ignore NUMBER remote directory "
-+"components.\n"
-+"\n"
-+msgstr ""
-+"Katalogi:\n"
-+" -nd, --no-directories nie zak³ada katalogów.\n"
-+" -x, --force-directories wymusza zak³adanie katalogów.\n"
-+" -nH, --no-host-directories nie zak³ada katalogów hostów.\n"
-+" -P, --directory-prefix=PREFIX zapisuje pliki do PREFIX/...\n"
-+" --cut-dirs=LICZBA ignoruje LICZBA zdalnych katalogów. "
-+"\n"
-+"\n"
-+
-+#: src/main.c:154
-+msgid ""
-+"HTTP options:\n"
-+" --http-user=USER set http user to USER.\n"
-+" --http-passwd=PASS set http password to PASS.\n"
-+" -C, --cache=on/off (dis)allow server-cached data (normally "
-+"allowed).\n"
-+" --ignore-length ignore `Content-Length' header field.\n"
-+" --header=STRING insert STRING among the headers.\n"
-+" --proxy-user=USER set USER as proxy username.\n"
-+" --proxy-passwd=PASS set PASS as proxy password.\n"
-+" -s, --save-headers save the HTTP headers to file.\n"
-+" -U, --user-agent=AGENT identify as AGENT instead of Wget/VERSION.\n"
-+"\n"
-+msgstr ""
-+"Opcje HTTP:\n"
-+" --http-user=USER ustawia u¿ytkownika po³±czenia http na USER.\n"
-+" --http-passwd=HAS£O ustawia has³o po³±czenia http na HAS£O.\n"
-+" -C, --cache=on/off (nie)dopuszcza cachowania danych po stronie "
-+"serwera (norm. dopuszcza).\n"
-+" --ignore-length ignoruje `Content-Length' z nag³ówka http.\n"
-+" --header=£AÑCUCH wstawia £¡ÑCUCH do nag³ówków http.\n"
-+" --proxy-user=USER ustawia u¿ytkownika proxy na USER.\n"
-+" --proxy-passwd=HAS£O ustawia has³o proxy na HAS£O.\n"
-+" -s, --save-headers zapisuje nag³ówki HTTP do pliku.\n"
-+" -U, --user-agent=AGENT identyfikuje siê jako AGENT a nie Wget/WERSJA.\n"
-+"\n"
-+
-+#: src/main.c:165
-+msgid ""
-+"FTP options:\n"
-+" --retr-symlinks retrieve FTP symbolic links.\n"
-+" -g, --glob=on/off turn file name globbing on or off.\n"
-+" --passive-ftp use the \"passive\" transfer mode.\n"
-+"\n"
-+msgstr ""
-+"Opcje FTP:\n"
-+" --retr-symlinks ¶ci±ga dowi±zania symboliczne FTP (symlinki).\n"
-+" -g, --glob=on/off w³±cza (on) lub wy³±cza (off) mo¿liwo¶æ u¿ywania wildcard-ów.\n"
-+" --passive-ftp u¿ywa transferu w trybie \"passive\".\n"
-+"\n"
-+
-+#: src/main.c:170
-+msgid ""
-+"Recursive retrieval:\n"
-+" -r, --recursive recursive web-suck -- use with care!.\n"
-+" -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n"
-+" --delete-after delete downloaded files.\n"
-+" -k, --convert-links convert non-relative links to relative.\n"
-+" -m, --mirror turn on options suitable for mirroring.\n"
-+" -nr, --dont-remove-listing don't remove `.listing' files.\n"
-+"\n"
-+msgstr ""
-+"¦ci±ganie rekurencyjne:\n"
-+" -r, --recursive rekurencyjne ¶ci±ganie z www - OSTRO¯NIE!.\n"
-+" -l, --level=LICZBA maksymalna g³êboko¶æ rekurencji (0 bez limitu).\n"
-+" --delete-after kasuje ¶ci±gniête pliki.\n"
-+" -k, --convert-links konwertuje nie-relacyjne linki na relacyjne.\n"
-+" -m, --mirror w³±cza opcje przydatne do mirrorowania.\n"
-+" -nr, --dont-remove-listing nie usuwa plików `.listing'.\n"
-+"\n"
-+
-+
-+#: src/main.c:178
-+msgid ""
-+"Recursive accept/reject:\n"
-+" -A, --accept=LIST list of accepted extensions.\n"
-+" -R, --reject=LIST list of rejected extensions.\n"
-+" -D, --domains=LIST list of accepted domains.\n"
-+" --exclude-domains=LIST comma-separated list of rejected "
-+"domains.\n"
-+" -L, --relative follow relative links only.\n"
-+" --follow-ftp follow FTP links from HTML documents.\n"
-+" -H, --span-hosts go to foreign hosts when recursive.\n"
-+" -I, --include-directories=LIST list of allowed directories.\n"
-+" -X, --exclude-directories=LIST list of excluded directories.\n"
-+" -nh, --no-host-lookup don't DNS-lookup hosts.\n"
-+" -np, --no-parent don't ascend to the parent directory.\n"
-+"\n"
-+msgstr ""
-+"Rekurencyjna akceptacja/odrzucenie:\n"
-+" -A, --accept=LISTA lista akceptowanych rozszerzeñ.\n"
-+" -R, --reject=LISTA lista odrzucanych rozszerzeñ.\n"
-+" -D, --domain=LISTA lista akceptowanych domen.\n"
-+" --exclude-domains=LISTA lista odrzucanych domen, rozdzielonych "
-+"przecinkami.\n"
-+" -L, --relative pod±¿a tylko za linkami relacyjnymi.\n"
-+" --follow-ftp pod±¿± za linkami do FTP z dokum. HTML.\n"
-+" -H, --span-hosts podczas rekurencji idzie do obcych hostów.\n"
-+" -I, --include-directories=LISTA lista dopuszczalnych katalogów.\n"
-+" -X, --exclude-directories=LISTA lista odrzucanych katalogów.\n"
-+" -nh, --no-host-lookup nie sprawdza nazw hostów w DNS.\n"
-+" -np, --no-parent nie wychodzi do katalogów nadrzêdnych.\n"
-+"\n"
-+
-+#: src/main.c:191
-+msgid "Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"
-+msgstr "Wy¶lij raport o b³êdach i sugestie do <bug-wget@gnu.org>.\n"
-+
-+#: src/main.c:347
-+#, c-format
-+msgid "%s: debug support not compiled in.\n"
-+msgstr "%s: nie wkompilowao wspomagania debugowania.\n"
-+
-+#: src/main.c:395
-+msgid ""
-+"Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n"
-+"This program is distributed in the hope that it will be useful,\n"
-+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
-+"GNU General Public License for more details.\n"
-+msgstr ""
-+"Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n"
-+"Ten program jest rozprowadzany w nadziei, ¿e bêdzie u¿yteczny,\n"
-+"jednak¿e BEZ ¯ADNEJ GWARANCJI; w szczególno¶ci gwarancji U¯YTECZNO¦CI\n"
-+"DO JAKICHKOLWIEK ZASTOSOWAÑ. Przeczytaj GNU General Public License,\n"
-+"(Publiczna licencja GNU) aby dowiedzieæ siê wiêcej.\n"
-+
-+#: src/main.c:401
-+msgid ""
-+"\n"
-+"Written by Hrvoje Niksic <hniksic@srce.hr>.\n"
-+msgstr ""
-+"\n"
-+"Autor - Hrvoje Niksic <hniksic@srce.hr>.\n"
-+
-+#: src/main.c:465
-+#, c-format
-+msgid "%s: %s: invalid command\n"
-+msgstr "%s: %s: b³êdne polecenie\n"
-+
-+#: src/main.c:515
-+#, c-format
-+msgid "%s: illegal option -- `-n%c'\n"
-+msgstr "%s: nielegalna opcja -- `-n%c'\n"
-+
-+#. #### Something nicer should be printed here -- similar to the
-+#. pre-1.5 `--help' page.
-+#: src/main.c:517 src/main.c:558 src/main.c:589
-+#, c-format
-+msgid "Try `%s --help' for more options.\n"
-+msgstr "Spróbuj `%s --help' aby uzyskaæ pomoc.\n"
-+
-+#: src/main.c:569
-+msgid "Can't be verbose and quiet at the same time.\n"
-+msgstr "Nie mogê byæ jednocze¶nie rozwlek³y i zwiêz³y :-).\n"
-+
-+#: src/main.c:575
-+msgid "Can't timestamp and not clobber old files at the same time.\n"
-+msgstr "¦ci±ganie plików nowszych i zakaz nadpisywania wykluczaj± siê wzajemnie.\n"
-+
-+#. No URL specified.
-+#: src/main.c:584
-+#, c-format
-+msgid "%s: missing URL\n"
-+msgstr "%s: brakuje URL\n"
-+
-+#: src/main.c:668
-+#, c-format
-+msgid "No URLs found in %s.\n"
-+msgstr "Nie znaleziono URL-i w %s.\n"
-+
-+#: src/main.c:677
-+#, c-format
-+msgid ""
-+"\n"
-+"FINISHED --%s--\n"
-+"Downloaded: %s bytes in %d files\n"
-+msgstr ""
-+"\n"
-+"ZAKOÑCZONO --%s--\n"
-+"¦ci±gniêto: %s bajtów w %d pliku(ach)\n"
-+
-+#: src/main.c:682
-+#, c-format
-+msgid "Download quota (%s bytes) EXCEEDED!\n"
-+msgstr "Osi±gniêto maksymaln± wielko¶æ ¶ci±ganych danych (%s bajtów)!\n"
-+
-+#. Please note that the double `%' in `%%s' is intentional, because
-+#. redirect_output passes tmp through printf.
-+#: src/main.c:709
-+msgid "%s received, redirecting output to `%%s'.\n"
-+msgstr "odebrano %s, wyj¶cie skierowujê do `%%s'.\n"
-+
-+#: src/mswindows.c:118
-+#, c-format
-+msgid ""
-+"\n"
-+"CTRL+Break received, redirecting output to `%s'.\n"
-+"Execution continued in background.\n"
-+"You may stop Wget by pressing CTRL+ALT+DELETE.\n"
-+msgstr ""
-+"\n"
-+"Naci¶niêto CTRL+Break, wyj¶cie skierowujê do `%s'.\n"
-+"Kontynuujê dzia³anie w tle.\n"
-+"Mo¿esz zatrzymaæ Wget-a naciskaj±c CTRL+ALT+DELETE.\n"
-+
-+#. parent, no error
-+#: src/mswindows.c:135 src/utils.c:265
-+msgid "Continuing in background.\n"
-+msgstr "Kontynuujê w tle.\n"
-+
-+#: src/mswindows.c:137 src/utils.c:267
-+#, c-format
-+msgid "Output will be written to `%s'.\n"
-+msgstr "Wyj¶cie bêdzie zapisywane do `%s'.\n"
-+
-+#: src/mswindows.c:227
-+#, c-format
-+msgid "Starting WinHelp %s\n"
-+msgstr "Uruchamiam WinHelp %s\n"
-+
-+#: src/mswindows.c:254 src/mswindows.c:262
-+#, c-format
-+msgid "%s: Couldn't find usable socket driver.\n"
-+msgstr "%s: Nie mogê znale¼æ odpowiedniego drivera socketów (socket driver).\n"
-+
-+#: src/netrc.c:330
-+#, c-format
-+msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
-+msgstr "%s: %s:%d: ostrze¿enie: znak (token) \"%s\" przed nazw± komputera\n"
-+
-+#: src/netrc.c:362
-+#, c-format
-+msgid "%s: %s:%d: unknown token \"%s\"\n"
-+msgstr "%s: %s:%d: nieznany znak (token) \"%s\"\n"
-+
-+#: src/netrc.c:426
-+#, c-format
-+msgid "Usage: %s NETRC [HOSTNAME]\n"
-+msgstr "Opis: %s NETRC [NAZWAHOSTA]\n"
-+
-+#: src/netrc.c:436
-+#, c-format
-+msgid "%s: cannot stat %s: %s\n"
-+msgstr "%s: cannot stat %s: %s\n"
-+
-+#: src/recur.c:449 src/retr.c:466
-+#, c-format
-+msgid "Removing %s.\n"
-+msgstr "Usuwam %s.\n"
-+
-+#: src/recur.c:450
-+#, c-format
-+msgid "Removing %s since it should be rejected.\n"
-+msgstr "Usuwam %s poniewa¿ powinien byæ odrzucony.\n"
-+
-+#: src/recur.c:609
-+msgid "Loading robots.txt; please ignore errors.\n"
-+msgstr "£adujê robots.txt: proszê zignorowaæ b³êdy.\n"
-+
-+#: src/retr.c:197
-+#, c-format
-+msgid ""
-+"\n"
-+" [ skipping %dK ]"
-+msgstr ""
-+"\n"
-+" [ pomijam %dK ]"
-+
-+#: src/retr.c:348
-+msgid "Could not find proxy host.\n"
-+msgstr "Nie moge znale¼æ hosta proxy.\n"
-+
-+#: src/retr.c:359
-+#, c-format
-+msgid "Proxy %s: Must be HTTP.\n"
-+msgstr "Proxy %s: Musi byæ HTTP.\n"
-+
-+#: src/retr.c:402
-+#, c-format
-+msgid "%s: Redirection to itself.\n"
-+msgstr "%s: Odwo³anie do samego siebie.\n"
-+
-+#: src/retr.c:487
-+msgid ""
-+"Giving up.\n"
-+"\n"
-+msgstr ""
-+"Poddajê siê.\n"
-+"\n"
-+
-+#: src/retr.c:487
-+msgid ""
-+"Retrying.\n"
-+"\n"
-+msgstr ""
-+"Powtarzam.\n"
-+"\n"
-+
-+#: src/url.c:940
-+#, c-format
-+msgid "Error (%s): Link %s without a base provided.\n"
-+msgstr "B³±d (%s): Odwo³anie %s jest bez podstawowego URL-a.\n"
-+
-+#: src/url.c:954
-+#, c-format
-+msgid "Error (%s): Base %s relative, without referer URL.\n"
-+msgstr "B³±d (%s): Podstawowy %s jest relatywny, bez odno¶nego URL-a.\n"
-+
-+#: src/url.c:1363
-+#, c-format
-+msgid "Converting %s... "
-+msgstr "Konwertujê %s... "
-+
-+#: src/url.c:1368 src/url.c:1379
-+#, c-format
-+msgid "Cannot convert links in %s: %s\n"
-+msgstr "Nie mogê skonwertowaæ linków w %s: %s\n"
-+
-+#: src/utils.c:68
-+#, c-format
-+msgid "%s: %s: Not enough memory.\n"
-+msgstr "%s: %s: Za ma³o pamiêci.\n"
-+
-+#: src/utils.c:200
-+msgid "Unknown/unsupported protocol"
-+msgstr "Nieznany/nieobs³ugiwany protokó³"
-+
-+#: src/utils.c:203
-+msgid "Invalid port specification"
-+msgstr "B³êdna specyfikacja portu"
-+
-+#: src/utils.c:206
-+msgid "Invalid host name"
-+msgstr "B³êdna nazwa hosta"
-+
-+#: src/utils.c:427
-+#, c-format
-+msgid "Failed to unlink symlink `%s': %s\n"
-+msgstr "Nie mogê usun±æ dowi±zania symbolicznego `%s': %s\n"