summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun>2000-08-16 06:38:44 +0000
committeritojun <itojun>2000-08-16 06:38:44 +0000
commitf2c3373144e854147c1ac47233f4678c161299aa (patch)
tree21d4f02e04e4bede5327bd91cd75fc685cb21f93
parent5d1c5cc7972a8897b788fbdaf57596c4ebd3293e (diff)
downloadpkgsrc-f2c3373144e854147c1ac47233f4678c161299aa.tar.gz
use latest IPv6 patch from kame (now supports IPv6 FTP properly).
patches/patch-?? contain IPv6 patches only, switch to PATCHFILES.
Diffstat
-rw-r--r--net/wget/Makefile6
-rw-r--r--net/wget/files/md53
-rw-r--r--net/wget/files/patch-sum13
-rw-r--r--net/wget/patches/patch-aa2054
-rw-r--r--net/wget/patches/patch-ab71
-rw-r--r--net/wget/patches/patch-ac255
-rw-r--r--net/wget/patches/patch-ad16
-rw-r--r--net/wget/patches/patch-ae12
-rw-r--r--net/wget/patches/patch-af57
-rw-r--r--net/wget/patches/patch-ag12
10 files changed, 12 insertions, 2487 deletions
diff --git a/net/wget/Makefile b/net/wget/Makefile
index b7b80517f0f..158ee1a14fa 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/03/26 14:16:42 itojun Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/16 06:38:44 itojun Exp $
# FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
#
@@ -6,6 +6,10 @@ DISTNAME= wget-1.5.3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU:=wget/}
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES= wget-153-v6-20000816.diff.gz
+PATCH_DIST_STRIP=-p1
+
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/wget/wget.html
diff --git a/net/wget/files/md5 b/net/wget/files/md5
index 19126f96ba5..72f1499e2b6 100644
--- a/net/wget/files/md5
+++ b/net/wget/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.7 2000/03/26 14:16:43 itojun Exp $
+$NetBSD: md5,v 1.8 2000/08/16 06:38:45 itojun Exp $
MD5 (wget-1.5.3.tar.gz) = 47680b25bf893afdb0c43b24e3fc2fd6
+MD5 (wget-153-v6-20000816.diff.gz) = 75c15f97f8926077a26a00d8ef88ff60
diff --git a/net/wget/files/patch-sum b/net/wget/files/patch-sum
index f35ccd2b0c1..006a0af7e52 100644
--- a/net/wget/files/patch-sum
+++ b/net/wget/files/patch-sum
@@ -1,9 +1,6 @@
-$NetBSD: patch-sum,v 1.1 2000/03/26 14:16:44 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/16 06:38:45 itojun Exp $
-MD5 (patch-aa) = a351ea34398d78159dbbd7cab54e8076
-MD5 (patch-ab) = 0a04bb0684de514858809bf14fa62c93
-MD5 (patch-ac) = 851c9e2f2e6ffbf1fd96707a1d0f47d0
-MD5 (patch-ad) = e1b313d51fc54866cf90af0449dc5a5f
-MD5 (patch-ae) = e23479ed0fb1fe5515d1e357d58db412
-MD5 (patch-af) = 707ec3212741f6a69ebd004e8cc9bfee
-MD5 (patch-ag) = 79fb6520c0862342892f853d6bd820e0
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/net/wget/patches/patch-aa b/net/wget/patches/patch-aa
deleted file mode 100644
index 1e7813d911e..00000000000
--- a/net/wget/patches/patch-aa
+++ /dev/null
@@ -1,2054 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/03/26 14:16:44 itojun Exp $
---- configure.orig Wed Jun 24 06:36:31 1998
-+++ configure Sun Mar 26 23:11:07 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,383 @@
- 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;
-+ if test -f /usr/local/v6/lib/libinet6.a ; then
-+ ipv6lib=inet6;
-+ ipv6libdir=/usr/local/v6/lib;
-+ fi
-+ 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 1044 "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 1065 "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 1086 "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 "$ipv6lib" != "none"; then
-+ if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
-+ LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
-+ else
-+ echo 'Fatal: no $ipv6lib library found. cannot continue.'
-+ echo "You need to fetch lib$ipv6lib.a from appropriate"
-+ echo 'ipv6 kit and compile beforehand.'
-+ exit 1
-+ fi
-+fi
-+
-+echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6
-+echo "configure:1125: 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 1131 "configure"
-+#include "confdefs.h"
-+
-+#include <sys/types.h>
-+#include <netdb.h>
-+#include <string.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+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_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;
-+ }
-+ switch (ai->ai_family) {
-+ case AF_INET:
-+ if (strcmp(strport, "54321") != 0) {
-+ goto bad;
-+ }
-+ 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 (strcmp(strport, "54321") != 0) {
-+ goto bad;
-+ }
-+ 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:1215: \"$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:1239: 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 1244 "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:1267: \"$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 +1359,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:1356: 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 +1393,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:1395: 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 +1446,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 +1455,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 +1467,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 +1475,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:1472: 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 +1491,7 @@
- do
- CC="$ac_save_CC $ac_arg"
- cat > conftest.$ac_ext <<EOF
--#line 1037 "configure"
-+#line 1488 "configure"
- #include "confdefs.h"
- #if !defined(__STDC__) || __STDC__ != 1
- choke me
-@@ -1051,7 +1509,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:1506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -1073,7 +1531,7 @@
-
-
- echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
--echo "configure:1077: checking for function prototypes" >&5
-+echo "configure:1528: 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 +1544,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:1541: 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 1546 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1099,8 +1557,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:1554: \"$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 +1574,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 1571 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1134,7 +1592,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 1589 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1155,7 +1613,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1159 "configure"
-+#line 1610 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1166,7 +1624,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:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1193,18 +1651,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:1648: 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 1653 "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:1658: \"$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 +1691,12 @@
-
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1237: checking for working const" >&5
-+echo "configure:1688: 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 1693 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -1287,7 +1745,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -1308,12 +1766,12 @@
- fi
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1312: checking for size_t" >&5
-+echo "configure:1763: 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 1768 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1322,7 +1780,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 +1799,12 @@
- fi
-
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:1345: checking for pid_t" >&5
-+echo "configure:1796: 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 1801 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1355,7 +1813,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 +1832,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:1829: 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 1836 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -1392,11 +1850,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1847: \"$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 1851 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -1407,7 +1865,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_bigendian=yes
- else
-@@ -1427,7 +1885,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 1882 "configure"
- #include "confdefs.h"
- main () {
- /* Are we little or big endian? From Harbison&Steele. */
-@@ -1440,7 +1898,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:1895: \"$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 +1926,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:1923: 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 1928 "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:1933: \"$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 +1966,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:1963: 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 1968 "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:1973: \"$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 +2003,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:2000: 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 2005 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -1559,7 +2017,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:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -1581,12 +2039,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:2036: 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 2041 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1603,7 +2061,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:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -1623,10 +2081,10 @@
-
-
- echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
--echo "configure:1627: checking for struct utimbuf" >&5
-+echo "configure:2078: checking for struct utimbuf" >&5
- if test x"$ac_cv_header_utime_h" = xyes; then
- cat > conftest.$ac_ext <<EOF
--#line 1630 "configure"
-+#line 2081 "configure"
- #include "confdefs.h"
- #include <utime.h>
- EOF
-@@ -1651,19 +2109,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:2106: 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 2111 "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:2118: \"$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 +2142,30 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1688: checking for alloca" >&5
-+echo "configure:2139: 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 2144 "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 +2175,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:2172: \"$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 +2200,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:2204: 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 2209 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -1774,12 +2237,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:2234: 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 2239 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1802,7 +2265,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:2262: \"$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 +2292,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:2289: 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 +2300,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 1841 "configure"
-+#line 2297 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -1856,7 +2319,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:2316: \"$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 +2343,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:2340: 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 2345 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1908,7 +2371,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:2368: \"$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 +2398,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:2395: 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 2400 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1963,7 +2426,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:2423: \"$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 +2453,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:2450: 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 2455 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2018,7 +2481,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:2478: \"$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 +2508,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:2505: 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 2510 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2073,7 +2536,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:2533: \"$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 +2564,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:2561: 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 2566 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2129,7 +2592,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:2589: \"$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 +2614,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:2611: 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 +2622,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2163 "configure"
-+#line 2619 "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 +2633,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:2630: \"$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 +2667,7 @@
-
-
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:2208: checking for socket in -lsocket" >&5
-+echo "configure:2664: 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 +2675,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2216 "configure"
-+#line 2672 "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 +2686,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:2683: \"$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 +2717,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:2714: 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 +2725,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2266 "configure"
-+#line 2722 "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:2729: \"$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 +2760,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:2757: 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 +2768,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocks $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2309 "configure"
-+#line 2765 "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 +2779,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:2776: \"$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 +2811,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:2808: 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 +2828,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:2825: 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 +2862,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:2859: 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 +2897,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:2894: 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 +2905,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 +2947,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:2944: 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 2949 "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:2954: \"$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 +2987,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:2984: 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 2989 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2548,7 +3015,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:3012: \"$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 +3037,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:3034: 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 +3045,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2582 "configure"
-+#line 3042 "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 +3056,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:3053: \"$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 +3124,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:3121: 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 +3183,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 +3250,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 +3270,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 +3295,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 --git a/net/wget/patches/patch-ab b/net/wget/patches/patch-ab
deleted file mode 100644
index 723e849436d..00000000000
--- a/net/wget/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/03/26 14:16:45 itojun Exp $
---- src/connect.c.orig Sun Mar 29 23:28:15 1998
-+++ src/connect.c Fri Sep 24 15:49:42 1999
-@@ -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
diff --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac
deleted file mode 100644
index 04ffc0b33db..00000000000
--- a/net/wget/patches/patch-ac
+++ /dev/null
@@ -1,255 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/03/26 14:16:46 itojun Exp $
---- src/host.c.orig Mon Sep 21 18:55:42 1998
-+++ src/host.c Fri Sep 24 15:49:42 1999
-@@ -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_storage *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 --git a/net/wget/patches/patch-ad b/net/wget/patches/patch-ad
deleted file mode 100644
index 572e650c314..00000000000
--- a/net/wget/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/03/26 14:16:47 itojun Exp $
---- src/host.h.orig Sat Jan 31 03:38:01 1998
-+++ src/host.h Fri Sep 24 15:49:42 1999
-@@ -25,8 +25,11 @@
- /* Function declarations */
-
- struct hostent *ngethostbyname PARAMS ((const char *));
-+#ifdef INET6
-+int store_hostaddress PARAMS ((struct sockaddr_storage *, const char *));
-+#else
- int store_hostaddress PARAMS ((unsigned char *, const char *));
--
-+#endif
- void clean_hosts PARAMS ((void));
-
- char *realhost PARAMS ((const char *));
diff --git a/net/wget/patches/patch-ae b/net/wget/patches/patch-ae
deleted file mode 100644
index 9da0901c48b..00000000000
--- a/net/wget/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/03/26 14:16:47 itojun Exp $
---- src/init.c.orig Fri Sep 11 02:20:23 1998
-+++ src/init.c Fri Sep 24 15:49:42 1999
-@@ -113,6 +113,8 @@
- { "httpproxy", &opt.http_proxy, cmd_string },
- { "httpuser", &opt.http_user, cmd_string },
- { "ignorelength", &opt.ignore_length, cmd_boolean },
-+ { "inet", &opt.inet, cmd_boolean },
-+ { "inet6", &opt.inet6, cmd_boolean },
- { "includedirectories", &opt.includes, cmd_directory_vector },
- { "input", &opt.input_filename, cmd_string },
- { "killlonger", &opt.kill_longer, cmd_boolean },
diff --git a/net/wget/patches/patch-af b/net/wget/patches/patch-af
deleted file mode 100644
index 2d90ed02f4b..00000000000
--- a/net/wget/patches/patch-af
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/03/26 14:16:47 itojun Exp $
---- src/main.c.orig Fri Sep 11 03:41:53 1998
-+++ src/main.c Fri Sep 24 15:49:42 1999
-@@ -157,6 +157,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\
-+ --inet use IP version 4 socket.\n\
-+ --inet6 use IP version 6 socket.\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 +197,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 +213,8 @@
- { "force-html", no_argument, NULL, 'F'},
- { "help", no_argument, NULL, 'h' },
- { "ignore-length", no_argument, NULL, 10 },
-+ { "inet", no_argument, NULL, '4' },
-+ { "inet6", no_argument, NULL, '6' },
- { "mirror", no_argument, NULL, 'm' },
- { "no-clobber", no_argument, NULL, 13 },
- { "no-directories", no_argument, NULL, 19 },
-@@ -334,6 +338,12 @@
- case 22:
- setval ("simplehostcheck", "on");
- break;
-+ case '4':
-+ setval ("inet", "on");
-+ break;
-+ case '6':
-+ setval ("inet6", "on");
-+ break;
- case 'b':
- setval ("background", "on");
- break;
-@@ -572,6 +582,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 --git a/net/wget/patches/patch-ag b/net/wget/patches/patch-ag
deleted file mode 100644
index b0d458b2ce0..00000000000
--- a/net/wget/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/03/26 14:16:48 itojun Exp $
---- src/options.h.orig Tue Apr 28 23:29:40 1998
-+++ src/options.h Fri Sep 24 15:49:42 1999
-@@ -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? */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 21:11:15 +0000