Update fetchmail to 5.0.0.

fetchmail-5.0.0 (Mon Apr  5 11:00:24 EDT 1999):
* Update for fetchsetup from Kent Robotti.
* Eliminate a realloc error in fetchmail -v -v progress message generation.
* Spanish-language update by Javier Kohen.
* French-language update by Guy Brand.
* Danish summary and description for specgen.sh.
* Henrik Storner's fix for the PGP/mimedecode problem.
* Fix netrc search code to be able to search >1 host entry per file.
* Added heads-up about SpryNet in the FAQ and a test in the autoprobe code.
* Removed the Hotmole script.  Instead, the web page and FAQ now refer to it.

fetchmail-4.7.9 (Tue Mar  9 13:25:01 EST 1999):
* Patch by Dan Root to solve an endianness problem in IMAP-K4.
* Fix lexical-analyzer bug that rejected `set nobouncemail',
* Prevent send_bouncemail from stepping on SMTP antispam response.
* Added French internationalization (LC_ALL=fr) from Guy Brand.
* Added Hugo Rabson's script for fetching from Hotmail.
* Test for .fetchmailrc ownership using geteuid() when possible.
* Prevent parsing of delimited protocols from tripping up on a
  MIME-armored line consisting of "=2E\r\n".

fetchmail-4.7.8 (Mon Feb 22 10:06:04 EST 1999):
* FreeBSD support for interface and monitor options by Andy Doran <ad@psn.ie>.
* Fixed server-deletion bug in fetchmailconf.  Also, handle `port' properly.
* Timestamps now generated into logfiles at start of poll cycle.
* New `nobounce' debugging option (specifically exempted from feature freeze)
  allows SMTP error bouncemail to be redirected from sender to local
  postmaster.
* Suppress dancing progress dots when syslog is on.
* es.po update by Javier Kohen.
* Added FAQ material on what to do for a "do not relay" sendmail response.
* Can now build under Lynx 3.0.0.

3 files changed, 578 insertions, 578 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 21a6ac3629a..35896d34df9 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 1999/03/29 16:26:46 tron Exp $
+# $NetBSD: Makefile,v 1.40 1999/04/11 09:00:42 frueauf Exp $
 #
 
-DISTNAME=       fetchmail-4.7.7
+DISTNAME=       fetchmail-5.0.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/ \
 		http://www.tuxedo.org/~esr/fetchmail/ \
diff --git a/mail/fetchmail/files/md5 b/mail/fetchmail/files/md5
index ebdd7b9a747..ca767a68a48 100644
--- a/mail/fetchmail/files/md5
+++ b/mail/fetchmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.27 1999/02/03 13:00:18 frueauf Exp $
+$NetBSD: md5,v 1.28 1999/04/11 09:00:42 frueauf Exp $
 
-MD5 (fetchmail-4.7.7.tar.gz) = 915b74d5959b890feb71ce6a6af4e9b4
+MD5 (fetchmail-5.0.0.tar.gz) = b335d27ee666438f49c9eb5422b3a0e7
diff --git a/mail/fetchmail/patches/patch-ad b/mail/fetchmail/patches/patch-ad
index 3061861c839..6a04be52edc 100644
--- a/mail/fetchmail/patches/patch-ad
+++ b/mail/fetchmail/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 1999/04/11 09:00:42 frueauf Exp $
 
---- configure.orig	Sun Jan 31 19:21:07 1999
-+++ configure	Wed Feb  3 13:25:33 1999
+--- configure.orig	Tue Mar  9 15:20:30 1999
++++ configure	Wed Apr  7 21:50:37 1999
 @@ -1,7 +1,7 @@
  #! /bin/sh
  
@@ -702,21 +702,21 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_YACC="$ac_prog"
-@@ -1517,7 +1597,7 @@
- ALL_LINGUAS="pt_BR es pl"
+@@ -1521,7 +1601,7 @@
+ ALL_LINGUAS="pt_BR es pl fr"
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1521: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1601: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-echo "configure:1525: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:1605: 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
-@@ -1546,15 +1626,16 @@
+@@ -1550,15 +1630,16 @@
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1550: checking for $ac_word" >&5
-+echo "configure:1630: checking for $ac_word" >&5
+-echo "configure:1554: checking for $ac_word" >&5
++echo "configure:1634: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -731,47 +731,47 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
-@@ -1573,21 +1654,21 @@
+@@ -1577,21 +1658,21 @@
  fi
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1577: checking for inline" >&5
-+echo "configure:1658: checking for inline" >&5
+-echo "configure:1581: checking for inline" >&5
++echo "configure:1662: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
--#line 1584 "configure"
-+#line 1665 "configure"
+-#line 1588 "configure"
++#line 1669 "configure"
  #include "confdefs.h"
  
  int main() {
  } $ac_kw foo() {
  ; return 0; }
  EOF
--if { (eval echo configure:1591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:1595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -1613,12 +1694,12 @@
+@@ -1617,12 +1698,12 @@
  esac
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:1617: checking for off_t" >&5
-+echo "configure:1698: checking for off_t" >&5
+-echo "configure:1621: checking for off_t" >&5
++echo "configure:1702: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 1622 "configure"
-+#line 1703 "configure"
+-#line 1626 "configure"
++#line 1707 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -1627,7 +1708,7 @@
+@@ -1631,7 +1712,7 @@
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -780,41 +780,41 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
    rm -rf conftest*
    ac_cv_type_off_t=yes
  else
-@@ -1648,19 +1729,19 @@
+@@ -1652,19 +1733,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:1652: checking for working alloca.h" >&5
-+echo "configure:1733: checking for working alloca.h" >&5
+-echo "configure:1656: checking for working alloca.h" >&5
++echo "configure:1737: 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 1657 "configure"
-+#line 1738 "configure"
+-#line 1661 "configure"
++#line 1742 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
--if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1749: \"$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
-@@ -1681,25 +1762,30 @@
+@@ -1685,25 +1766,30 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1685: checking for alloca" >&5
-+echo "configure:1766: checking for alloca" >&5
+-echo "configure:1689: checking for alloca" >&5
++echo "configure:1770: 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 1690 "configure"
-+#line 1771 "configure"
+-#line 1694 "configure"
++#line 1775 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
@@ -841,16 +841,16 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
  #   endif
  #  endif
  # endif
-@@ -1709,7 +1795,7 @@
+@@ -1713,7 +1799,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
--if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1803: \"$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
-@@ -1734,19 +1820,19 @@
+@@ -1738,19 +1824,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.
@@ -862,403 +862,403 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:1745: checking whether alloca needs Cray hooks" >&5
-+echo "configure:1831: checking whether alloca needs Cray hooks" >&5
+-echo "configure:1749: checking whether alloca needs Cray hooks" >&5
++echo "configure:1835: 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 1750 "configure"
-+#line 1836 "configure"
+-#line 1754 "configure"
++#line 1840 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -1771,12 +1857,12 @@
+@@ -1775,12 +1861,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:1775: checking for $ac_func" >&5
-+echo "configure:1861: checking for $ac_func" >&5
+-echo "configure:1779: checking for $ac_func" >&5
++echo "configure:1865: 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 1780 "configure"
-+#line 1866 "configure"
+-#line 1784 "configure"
++#line 1870 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -1799,7 +1885,7 @@
+@@ -1803,7 +1889,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1893: \"$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
-@@ -1826,7 +1912,7 @@
+@@ -1830,7 +1916,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:1830: checking stack direction for C alloca" >&5
-+echo "configure:1916: checking stack direction for C alloca" >&5
+-echo "configure:1834: checking stack direction for C alloca" >&5
++echo "configure:1920: 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
-@@ -1834,7 +1920,7 @@
+@@ -1838,7 +1924,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 1838 "configure"
-+#line 1924 "configure"
+-#line 1842 "configure"
++#line 1928 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -1853,7 +1939,7 @@
+@@ -1857,7 +1943,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1947: \"$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
-@@ -1878,18 +1964,18 @@
+@@ -1882,18 +1968,18 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1882: checking for $ac_hdr" >&5
-+echo "configure:1968: checking for $ac_hdr" >&5
+-echo "configure:1886: checking for $ac_hdr" >&5
++echo "configure:1972: 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 1887 "configure"
-+#line 1973 "configure"
+-#line 1891 "configure"
++#line 1977 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:1896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1982: \"$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"
-@@ -1917,12 +2003,12 @@
+@@ -1921,12 +2007,12 @@
  for ac_func in getpagesize
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1921: checking for $ac_func" >&5
-+echo "configure:2007: checking for $ac_func" >&5
+-echo "configure:1925: checking for $ac_func" >&5
++echo "configure:2011: 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 1926 "configure"
-+#line 2012 "configure"
+-#line 1930 "configure"
++#line 2016 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -1945,7 +2031,7 @@
+@@ -1949,7 +2035,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2039: \"$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
-@@ -1970,7 +2056,7 @@
+@@ -1974,7 +2060,7 @@
  done
  
  echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:1974: checking for working mmap" >&5
-+echo "configure:2060: checking for working mmap" >&5
+-echo "configure:1978: checking for working mmap" >&5
++echo "configure:2064: checking for working mmap" >&5
  if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1978,7 +2064,7 @@
+@@ -1982,7 +2068,7 @@
    ac_cv_func_mmap_fixed_mapped=no
  else
    cat > conftest.$ac_ext <<EOF
--#line 1982 "configure"
-+#line 2068 "configure"
+-#line 1986 "configure"
++#line 2072 "configure"
  #include "confdefs.h"
  
  /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -2118,7 +2204,7 @@
+@@ -2122,7 +2208,7 @@
  }
  
  EOF
--if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_mmap_fixed_mapped=yes
  else
-@@ -2146,18 +2232,18 @@
+@@ -2150,18 +2236,18 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2150: checking for $ac_hdr" >&5
-+echo "configure:2236: checking for $ac_hdr" >&5
+-echo "configure:2154: checking for $ac_hdr" >&5
++echo "configure:2240: 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 2155 "configure"
-+#line 2241 "configure"
+-#line 2159 "configure"
++#line 2245 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2250: \"$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"
-@@ -2186,12 +2272,12 @@
+@@ -2190,12 +2276,12 @@
  strdup __argz_count __argz_stringify __argz_next
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2190: checking for $ac_func" >&5
-+echo "configure:2276: checking for $ac_func" >&5
+-echo "configure:2194: checking for $ac_func" >&5
++echo "configure:2280: 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 2195 "configure"
-+#line 2281 "configure"
+-#line 2199 "configure"
++#line 2285 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -2214,7 +2300,7 @@
+@@ -2218,7 +2304,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:2218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2308: \"$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
-@@ -2243,12 +2329,12 @@
+@@ -2247,12 +2333,12 @@
       for ac_func in stpcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2247: checking for $ac_func" >&5
-+echo "configure:2333: checking for $ac_func" >&5
+-echo "configure:2251: checking for $ac_func" >&5
++echo "configure:2337: 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 2252 "configure"
-+#line 2338 "configure"
+-#line 2256 "configure"
++#line 2342 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -2271,7 +2357,7 @@
+@@ -2275,7 +2361,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2365: \"$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
-@@ -2305,19 +2391,19 @@
+@@ -2309,19 +2395,19 @@
  
     if test $ac_cv_header_locale_h = yes; then
      echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:2309: checking for LC_MESSAGES" >&5
-+echo "configure:2395: checking for LC_MESSAGES" >&5
+-echo "configure:2313: checking for LC_MESSAGES" >&5
++echo "configure:2399: checking for LC_MESSAGES" >&5
  if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 2314 "configure"
-+#line 2400 "configure"
+-#line 2318 "configure"
++#line 2404 "configure"
  #include "confdefs.h"
  #include <locale.h>
  int main() {
  return LC_MESSAGES
  ; return 0; }
  EOF
--if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    am_cv_val_LC_MESSAGES=yes
  else
-@@ -2338,7 +2424,7 @@
+@@ -2342,7 +2428,7 @@
      fi
    fi
     echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:2342: checking whether NLS is requested" >&5
-+echo "configure:2428: checking whether NLS is requested" >&5
+-echo "configure:2346: checking whether NLS is requested" >&5
++echo "configure:2432: 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"
-@@ -2358,7 +2444,7 @@
+@@ -2362,7 +2448,7 @@
  EOF
  
        echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
--echo "configure:2362: checking whether included gettext is requested" >&5
-+echo "configure:2448: checking whether included gettext is requested" >&5
+-echo "configure:2366: checking whether included gettext is requested" >&5
++echo "configure:2452: checking whether included gettext is requested" >&5
        # Check whether --with-included-gettext or --without-included-gettext was given.
  if test "${with_included_gettext+set}" = set; then
    withval="$with_included_gettext"
-@@ -2377,18 +2463,18 @@
+@@ -2381,18 +2467,18 @@
  
  	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:2381: checking for libintl.h" >&5
-+echo "configure:2467: checking for libintl.h" >&5
+-echo "configure:2385: checking for libintl.h" >&5
++echo "configure:2471: checking for libintl.h" >&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 2386 "configure"
-+#line 2472 "configure"
+-#line 2390 "configure"
++#line 2476 "configure"
  #include "confdefs.h"
  #include <libintl.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2481: \"$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"
-@@ -2404,19 +2490,19 @@
+@@ -2408,19 +2494,19 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
--echo "configure:2408: checking for gettext in libc" >&5
-+echo "configure:2494: checking for gettext in libc" >&5
+-echo "configure:2412: checking for gettext in libc" >&5
++echo "configure:2498: checking for gettext in libc" >&5
  if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 2413 "configure"
-+#line 2499 "configure"
+-#line 2417 "configure"
++#line 2503 "configure"
  #include "confdefs.h"
  #include <libintl.h>
  int main() {
  return (int) gettext ("")
  ; return 0; }
  EOF
--if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    gt_cv_func_gettext_libc=yes
  else
-@@ -2432,7 +2518,7 @@
+@@ -2436,7 +2522,7 @@
  
  	   if test "$gt_cv_func_gettext_libc" != "yes"; then
  	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:2436: checking for bindtextdomain in -lintl" >&5
-+echo "configure:2522: checking for bindtextdomain in -lintl" >&5
+-echo "configure:2440: checking for bindtextdomain in -lintl" >&5
++echo "configure:2526: checking for bindtextdomain in -lintl" >&5
  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2440,7 +2526,7 @@
+@@ -2444,7 +2530,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 2444 "configure"
-+#line 2530 "configure"
+-#line 2448 "configure"
++#line 2534 "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
-@@ -2451,7 +2537,7 @@
+@@ -2455,7 +2541,7 @@
  bindtextdomain()
  ; return 0; }
  EOF
--if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2545: \"$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
-@@ -2467,12 +2553,12 @@
+@@ -2471,12 +2557,12 @@
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
--echo "configure:2471: checking for gettext in libintl" >&5
-+echo "configure:2557: checking for gettext in libintl" >&5
+-echo "configure:2475: checking for gettext in libintl" >&5
++echo "configure:2561: checking for gettext in libintl" >&5
  if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:2476: checking for gettext in -lintl" >&5
-+echo "configure:2562: checking for gettext in -lintl" >&5
+-echo "configure:2480: checking for gettext in -lintl" >&5
++echo "configure:2566: 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
-@@ -2480,7 +2566,7 @@
+@@ -2484,7 +2570,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 2484 "configure"
-+#line 2570 "configure"
+-#line 2488 "configure"
++#line 2574 "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
-@@ -2491,7 +2577,7 @@
+@@ -2495,7 +2581,7 @@
  gettext()
  ; return 0; }
  EOF
--if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2585: \"$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
-@@ -2530,7 +2616,7 @@
+@@ -2534,7 +2620,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:2534: checking for $ac_word" >&5
-+echo "configure:2620: checking for $ac_word" >&5
+-echo "configure:2538: checking for $ac_word" >&5
++echo "configure:2624: 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
-@@ -2564,12 +2650,12 @@
+@@ -2568,12 +2654,12 @@
  		for ac_func in dcgettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2568: checking for $ac_func" >&5
-+echo "configure:2654: checking for $ac_func" >&5
+-echo "configure:2572: checking for $ac_func" >&5
++echo "configure:2658: 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 2573 "configure"
-+#line 2659 "configure"
+-#line 2577 "configure"
++#line 2663 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -2592,7 +2678,7 @@
+@@ -2596,7 +2682,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:2596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2686: \"$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
-@@ -2619,7 +2705,7 @@
+@@ -2623,7 +2709,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:2623: checking for $ac_word" >&5
-+echo "configure:2709: checking for $ac_word" >&5
+-echo "configure:2627: checking for $ac_word" >&5
++echo "configure:2713: 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
-@@ -2627,9 +2713,13 @@
+@@ -2631,9 +2717,13 @@
    /*)
    ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
    ;;
@@ -1274,102 +1274,102 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-@@ -2651,7 +2741,7 @@
+@@ -2655,7 +2745,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:2655: checking for $ac_word" >&5
-+echo "configure:2745: checking for $ac_word" >&5
+-echo "configure:2659: checking for $ac_word" >&5
++echo "configure:2749: 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
-@@ -2683,7 +2773,7 @@
+@@ -2687,7 +2777,7 @@
  fi
  
  		cat > conftest.$ac_ext <<EOF
--#line 2687 "configure"
-+#line 2777 "configure"
+-#line 2691 "configure"
++#line 2781 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -2691,7 +2781,7 @@
+@@ -2695,7 +2785,7 @@
  			       return _nl_msg_cat_cntr
  ; return 0; }
  EOF
--if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    CATOBJEXT=.gmo
  		   DATADIRNAME=share
-@@ -2714,7 +2804,7 @@
+@@ -2718,7 +2808,7 @@
  
          if test "$CATOBJEXT" = "NONE"; then
  	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
--echo "configure:2718: checking whether catgets can be used" >&5
-+echo "configure:2808: checking whether catgets can be used" >&5
+-echo "configure:2722: checking whether catgets can be used" >&5
++echo "configure:2812: checking whether catgets can be used" >&5
  	  # Check whether --with-catgets or --without-catgets was given.
  if test "${with_catgets+set}" = set; then
    withval="$with_catgets"
-@@ -2727,7 +2817,7 @@
+@@ -2731,7 +2821,7 @@
  
  	  if test "$nls_cv_use_catgets" = "yes"; then
  	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
--echo "configure:2731: checking for main in -li" >&5
-+echo "configure:2821: checking for main in -li" >&5
+-echo "configure:2735: checking for main in -li" >&5
++echo "configure:2825: checking for main in -li" >&5
  ac_lib_var=`echo i'_'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
-@@ -2735,14 +2825,14 @@
+@@ -2739,14 +2829,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-li  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 2739 "configure"
-+#line 2829 "configure"
+-#line 2743 "configure"
++#line 2833 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
--if { (eval echo configure:2746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2840: \"$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
-@@ -2770,12 +2860,12 @@
+@@ -2774,12 +2864,12 @@
  fi
  
  	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
--echo "configure:2774: checking for catgets" >&5
-+echo "configure:2864: checking for catgets" >&5
+-echo "configure:2778: checking for catgets" >&5
++echo "configure:2868: checking for catgets" >&5
  if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 2779 "configure"
-+#line 2869 "configure"
+-#line 2783 "configure"
++#line 2873 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char catgets(); below.  */
-@@ -2798,7 +2888,7 @@
+@@ -2802,7 +2892,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_catgets=yes"
  else
-@@ -2820,7 +2910,7 @@
+@@ -2824,7 +2914,7 @@
  	       # Extract the first word of "gencat", so it can be a program name with args.
  set dummy gencat; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2824: checking for $ac_word" >&5
-+echo "configure:2914: checking for $ac_word" >&5
+-echo "configure:2828: checking for $ac_word" >&5
++echo "configure:2918: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2828,9 +2918,13 @@
+@@ -2832,9 +2922,13 @@
    /*)
    ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
    ;;
@@ -1385,16 +1385,16 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GENCAT="$ac_dir/$ac_word"
-@@ -2852,7 +2946,7 @@
+@@ -2856,7 +2950,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:2856: checking for $ac_word" >&5
-+echo "configure:2950: checking for $ac_word" >&5
+-echo "configure:2860: checking for $ac_word" >&5
++echo "configure:2954: 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
-@@ -2860,9 +2954,13 @@
+@@ -2864,9 +2958,13 @@
    /*)
    ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
    ;;
@@ -1410,43 +1410,43 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-@@ -2885,7 +2983,7 @@
+@@ -2889,7 +2987,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:2889: checking for $ac_word" >&5
-+echo "configure:2987: checking for $ac_word" >&5
+-echo "configure:2893: checking for $ac_word" >&5
++echo "configure:2991: 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
-@@ -2920,7 +3018,7 @@
+@@ -2924,7 +3022,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:2924: checking for $ac_word" >&5
-+echo "configure:3022: checking for $ac_word" >&5
+-echo "configure:2928: checking for $ac_word" >&5
++echo "configure:3026: 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
-@@ -2978,7 +3076,7 @@
+@@ -2982,7 +3080,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:2982: checking for $ac_word" >&5
-+echo "configure:3080: checking for $ac_word" >&5
+-echo "configure:2986: checking for $ac_word" >&5
++echo "configure:3084: 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
-@@ -3012,7 +3110,7 @@
+@@ -3016,7 +3114,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:3016: checking for $ac_word" >&5
-+echo "configure:3114: checking for $ac_word" >&5
+-echo "configure:3020: checking for $ac_word" >&5
++echo "configure:3118: 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
-@@ -3020,9 +3118,13 @@
+@@ -3024,9 +3122,13 @@
    /*)
    ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
    ;;
@@ -1462,433 +1462,433 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-@@ -3044,7 +3146,7 @@
+@@ -3048,7 +3150,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:3048: checking for $ac_word" >&5
-+echo "configure:3150: checking for $ac_word" >&5
+-echo "configure:3052: checking for $ac_word" >&5
++echo "configure:3154: 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
-@@ -3137,7 +3239,7 @@
+@@ -3141,7 +3243,7 @@
         LINGUAS=
       else
         echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:3141: checking for catalogs to be installed" >&5
-+echo "configure:3243: checking for catalogs to be installed" >&5
+-echo "configure:3145: checking for catalogs to be installed" >&5
++echo "configure:3247: checking for catalogs to be installed" >&5
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -3165,18 +3267,18 @@
+@@ -3169,18 +3271,18 @@
     if test "$CATOBJEXT" = ".cat"; then
       ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:3169: checking for linux/version.h" >&5
-+echo "configure:3271: checking for linux/version.h" >&5
+-echo "configure:3173: checking for linux/version.h" >&5
++echo "configure:3275: checking for linux/version.h" >&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 3174 "configure"
-+#line 3276 "configure"
+-#line 3178 "configure"
++#line 3280 "configure"
  #include "confdefs.h"
  #include <linux/version.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:3183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:3281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3285: \"$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"
-@@ -3247,12 +3349,12 @@
+@@ -3251,12 +3353,12 @@
  # errors at link-time.  It is thus better to only use the C library.
  # So don't add -linet to the link list unless it's necessary
  echo $ac_n "checking for socket""... $ac_c" 1>&6
--echo "configure:3251: checking for socket" >&5
-+echo "configure:3353: checking for socket" >&5
+-echo "configure:3255: checking for socket" >&5
++echo "configure:3357: checking for socket" >&5
  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3256 "configure"
-+#line 3358 "configure"
+-#line 3260 "configure"
++#line 3362 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socket(); below.  */
-@@ -3275,7 +3377,7 @@
+@@ -3279,7 +3381,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_socket=yes"
  else
-@@ -3293,7 +3395,7 @@
+@@ -3297,7 +3399,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:3297: checking for socket in -lsocket" >&5
-+echo "configure:3399: checking for socket in -lsocket" >&5
+-echo "configure:3301: checking for socket in -lsocket" >&5
++echo "configure:3403: 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
-@@ -3301,7 +3403,7 @@
+@@ -3305,7 +3407,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 3305 "configure"
-+#line 3407 "configure"
+-#line 3309 "configure"
++#line 3411 "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
-@@ -3312,7 +3414,7 @@
+@@ -3316,7 +3418,7 @@
  socket()
  ; return 0; }
  EOF
--if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3422: \"$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
-@@ -3340,7 +3442,7 @@
+@@ -3344,7 +3446,7 @@
  fi
  
      echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6
--echo "configure:3344: checking for socket in -linet" >&5
-+echo "configure:3446: checking for socket in -linet" >&5
+-echo "configure:3348: checking for socket in -linet" >&5
++echo "configure:3450: checking for socket in -linet" >&5
  ac_lib_var=`echo inet'_'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
-@@ -3348,7 +3450,7 @@
+@@ -3352,7 +3454,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 3352 "configure"
-+#line 3454 "configure"
+-#line 3356 "configure"
++#line 3458 "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
-@@ -3359,7 +3461,7 @@
+@@ -3363,7 +3465,7 @@
  socket()
  ; return 0; }
  EOF
--if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3469: \"$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
-@@ -3391,12 +3493,12 @@
+@@ -3395,12 +3497,12 @@
  
  # If gettext isn't in the C library, maybe there's a -lintl.
  echo $ac_n "checking for gettext""... $ac_c" 1>&6
--echo "configure:3395: checking for gettext" >&5
-+echo "configure:3497: checking for gettext" >&5
+-echo "configure:3399: checking for gettext" >&5
++echo "configure:3501: checking for gettext" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3400 "configure"
-+#line 3502 "configure"
+-#line 3404 "configure"
++#line 3506 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gettext(); below.  */
-@@ -3419,7 +3521,7 @@
+@@ -3423,7 +3525,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gettext=yes"
  else
-@@ -3437,7 +3539,7 @@
+@@ -3441,7 +3543,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:3441: checking for gettext in -lintl" >&5
-+echo "configure:3543: checking for gettext in -lintl" >&5
+-echo "configure:3445: checking for gettext in -lintl" >&5
++echo "configure:3547: 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
-@@ -3445,7 +3547,7 @@
+@@ -3449,7 +3551,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 3449 "configure"
-+#line 3551 "configure"
+-#line 3453 "configure"
++#line 3555 "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
-@@ -3456,7 +3558,7 @@
+@@ -3460,7 +3562,7 @@
  gettext()
  ; return 0; }
  EOF
--if { (eval echo configure:3460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3566: \"$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
-@@ -3488,12 +3590,12 @@
+@@ -3492,12 +3594,12 @@
  
  # The condition in this test copes with the presence of inet_addr in libc6.
  echo $ac_n "checking for inet_addr""... $ac_c" 1>&6
--echo "configure:3492: checking for inet_addr" >&5
-+echo "configure:3594: checking for inet_addr" >&5
+-echo "configure:3496: checking for inet_addr" >&5
++echo "configure:3598: checking for inet_addr" >&5
  if eval "test \"`echo '$''{'ac_cv_func_inet_addr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3497 "configure"
-+#line 3599 "configure"
+-#line 3501 "configure"
++#line 3603 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char inet_addr(); below.  */
-@@ -3516,7 +3618,7 @@
+@@ -3520,7 +3622,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_inet_addr=yes"
  else
-@@ -3534,7 +3636,7 @@
+@@ -3538,7 +3640,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
--echo "configure:3538: checking for inet_addr in -lnsl" >&5
-+echo "configure:3640: checking for inet_addr in -lnsl" >&5
+-echo "configure:3542: checking for inet_addr in -lnsl" >&5
++echo "configure:3644: checking for inet_addr in -lnsl" >&5
  ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3542,7 +3644,7 @@
+@@ -3546,7 +3648,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 3546 "configure"
-+#line 3648 "configure"
+-#line 3550 "configure"
++#line 3652 "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
-@@ -3553,7 +3655,7 @@
+@@ -3557,7 +3659,7 @@
  inet_addr()
  ; return 0; }
  EOF
--if { (eval echo configure:3557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3663: \"$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
-@@ -3584,7 +3686,7 @@
+@@ -3588,7 +3690,7 @@
  
  
  echo $ac_n "checking for strchr in -lcposix""... $ac_c" 1>&6
--echo "configure:3588: checking for strchr in -lcposix" >&5
-+echo "configure:3690: checking for strchr in -lcposix" >&5
+-echo "configure:3592: checking for strchr in -lcposix" >&5
++echo "configure:3694: checking for strchr in -lcposix" >&5
  ac_lib_var=`echo cposix'_'strchr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3592,7 +3694,7 @@
+@@ -3596,7 +3698,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lcposix  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 3596 "configure"
-+#line 3698 "configure"
+-#line 3600 "configure"
++#line 3702 "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
-@@ -3603,7 +3705,7 @@
+@@ -3607,7 +3709,7 @@
  strchr()
  ; return 0; }
  EOF
--if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3713: \"$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
-@@ -3626,12 +3728,12 @@
+@@ -3630,12 +3732,12 @@
  
  
  echo $ac_n "checking for strstr""... $ac_c" 1>&6
--echo "configure:3630: checking for strstr" >&5
-+echo "configure:3732: checking for strstr" >&5
+-echo "configure:3634: checking for strstr" >&5
++echo "configure:3736: checking for strstr" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strstr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3635 "configure"
-+#line 3737 "configure"
+-#line 3639 "configure"
++#line 3741 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strstr(); below.  */
-@@ -3654,7 +3756,7 @@
+@@ -3658,7 +3760,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strstr=yes"
  else
-@@ -3680,12 +3782,12 @@
+@@ -3684,12 +3786,12 @@
  
  
  echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
--echo "configure:3684: checking for strcasecmp" >&5
-+echo "configure:3786: checking for strcasecmp" >&5
+-echo "configure:3688: checking for strcasecmp" >&5
++echo "configure:3790: checking for strcasecmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3689 "configure"
-+#line 3791 "configure"
+-#line 3693 "configure"
++#line 3795 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strcasecmp(); below.  */
-@@ -3708,7 +3810,7 @@
+@@ -3712,7 +3814,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strcasecmp=yes"
  else
-@@ -3734,12 +3836,12 @@
+@@ -3738,12 +3840,12 @@
  
               
  echo $ac_n "checking for memmove""... $ac_c" 1>&6
--echo "configure:3738: checking for memmove" >&5
-+echo "configure:3840: checking for memmove" >&5
+-echo "configure:3742: checking for memmove" >&5
++echo "configure:3844: checking for memmove" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3743 "configure"
-+#line 3845 "configure"
+-#line 3747 "configure"
++#line 3849 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char memmove(); below.  */
-@@ -3762,7 +3864,7 @@
+@@ -3766,7 +3868,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_memmove=yes"
  else
-@@ -3788,12 +3890,12 @@
+@@ -3792,12 +3894,12 @@
  
               
  echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
--echo "configure:3792: checking for getopt_long" >&5
-+echo "configure:3894: checking for getopt_long" >&5
+-echo "configure:3796: checking for getopt_long" >&5
++echo "configure:3898: checking for getopt_long" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3797 "configure"
-+#line 3899 "configure"
+-#line 3801 "configure"
++#line 3903 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char getopt_long(); below.  */
-@@ -3816,7 +3918,7 @@
+@@ -3820,7 +3922,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_getopt_long=yes"
  else
-@@ -3842,12 +3944,12 @@
+@@ -3846,12 +3948,12 @@
  
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:3846: checking for vprintf" >&5
-+echo "configure:3948: checking for vprintf" >&5
+-echo "configure:3850: checking for vprintf" >&5
++echo "configure:3952: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3851 "configure"
-+#line 3953 "configure"
+-#line 3855 "configure"
++#line 3957 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
-@@ -3870,7 +3972,7 @@
+@@ -3874,7 +3976,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
-@@ -3894,12 +3996,12 @@
+@@ -3898,12 +4000,12 @@
  
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:3898: checking for _doprnt" >&5
-+echo "configure:4000: checking for _doprnt" >&5
+-echo "configure:3902: checking for _doprnt" >&5
++echo "configure:4004: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 3903 "configure"
-+#line 4005 "configure"
+-#line 3907 "configure"
++#line 4009 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
-@@ -3922,7 +4024,7 @@
+@@ -3926,7 +4028,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
-@@ -3949,19 +4051,19 @@
+@@ -3953,19 +4055,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:3953: checking for working alloca.h" >&5
-+echo "configure:4055: checking for working alloca.h" >&5
+-echo "configure:3957: checking for working alloca.h" >&5
++echo "configure:4059: 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 3958 "configure"
-+#line 4060 "configure"
+-#line 3962 "configure"
++#line 4064 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
--if { (eval echo configure:3965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4071: \"$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
-@@ -3982,25 +4084,30 @@
+@@ -3986,25 +4088,30 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:3986: checking for alloca" >&5
-+echo "configure:4088: checking for alloca" >&5
+-echo "configure:3990: checking for alloca" >&5
++echo "configure:4092: 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 3991 "configure"
-+#line 4093 "configure"
+-#line 3995 "configure"
++#line 4097 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
@@ -1915,16 +1915,16 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
  #   endif
  #  endif
  # endif
-@@ -4010,7 +4117,7 @@
+@@ -4014,7 +4121,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
--if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4125: \"$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
-@@ -4035,19 +4142,19 @@
+@@ -4039,19 +4146,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.
@@ -1936,563 +1936,563 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:4046: checking whether alloca needs Cray hooks" >&5
-+echo "configure:4153: checking whether alloca needs Cray hooks" >&5
+-echo "configure:4050: checking whether alloca needs Cray hooks" >&5
++echo "configure:4157: 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 4051 "configure"
-+#line 4158 "configure"
+-#line 4055 "configure"
++#line 4162 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -4072,12 +4179,12 @@
+@@ -4076,12 +4183,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:4076: checking for $ac_func" >&5
-+echo "configure:4183: checking for $ac_func" >&5
+-echo "configure:4080: checking for $ac_func" >&5
++echo "configure:4187: 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 4081 "configure"
-+#line 4188 "configure"
+-#line 4085 "configure"
++#line 4192 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4100,7 +4207,7 @@
+@@ -4104,7 +4211,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4215: \"$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
-@@ -4127,7 +4234,7 @@
+@@ -4131,7 +4238,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:4131: checking stack direction for C alloca" >&5
-+echo "configure:4238: checking stack direction for C alloca" >&5
+-echo "configure:4135: checking stack direction for C alloca" >&5
++echo "configure:4242: 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
-@@ -4135,7 +4242,7 @@
+@@ -4139,7 +4246,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 4139 "configure"
-+#line 4246 "configure"
+-#line 4143 "configure"
++#line 4250 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -4154,7 +4261,7 @@
+@@ -4158,7 +4265,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4269: \"$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
-@@ -4191,12 +4298,12 @@
+@@ -4196,12 +4303,12 @@
    atexit inet_aton strftime setrlimit socketpair sigprocmask
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4195: checking for $ac_func" >&5
-+echo "configure:4302: checking for $ac_func" >&5
+-echo "configure:4200: checking for $ac_func" >&5
++echo "configure:4307: 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 4200 "configure"
-+#line 4307 "configure"
+-#line 4205 "configure"
++#line 4312 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4219,7 +4326,7 @@
+@@ -4224,7 +4331,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4335: \"$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
-@@ -4249,12 +4356,12 @@
+@@ -4254,12 +4361,12 @@
  # library.  So don't add -lresolv to the link list unless it's necessary
  # (It will be necessary when using GNU libc6).
  echo $ac_n "checking for res_search""... $ac_c" 1>&6
--echo "configure:4253: checking for res_search" >&5
-+echo "configure:4360: checking for res_search" >&5
+-echo "configure:4258: checking for res_search" >&5
++echo "configure:4365: checking for res_search" >&5
  if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4258 "configure"
-+#line 4365 "configure"
+-#line 4263 "configure"
++#line 4370 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char res_search(); below.  */
-@@ -4277,7 +4384,7 @@
+@@ -4282,7 +4389,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_res_search=yes"
  else
-@@ -4295,7 +4402,7 @@
+@@ -4300,7 +4407,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
--echo "configure:4299: checking for res_search in -lresolv" >&5
-+echo "configure:4406: checking for res_search in -lresolv" >&5
+-echo "configure:4304: checking for res_search in -lresolv" >&5
++echo "configure:4411: checking for res_search in -lresolv" >&5
  ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4303,7 +4410,7 @@
+@@ -4308,7 +4415,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4307 "configure"
-+#line 4414 "configure"
+-#line 4312 "configure"
++#line 4419 "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
-@@ -4314,7 +4421,7 @@
+@@ -4319,7 +4426,7 @@
  res_search()
  ; return 0; }
  EOF
--if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4430: \"$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
-@@ -4343,9 +4450,9 @@
+@@ -4348,9 +4455,9 @@
  
  
  echo $ac_n "checking use of void pointer type""... $ac_c" 1>&6
--echo "configure:4347: checking use of void pointer type" >&5
-+echo "configure:4454: checking use of void pointer type" >&5
+-echo "configure:4352: checking use of void pointer type" >&5
++echo "configure:4459: checking use of void pointer type" >&5
  cat > conftest.$ac_ext <<EOF
--#line 4349 "configure"
-+#line 4456 "configure"
+-#line 4354 "configure"
++#line 4461 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -4355,7 +4462,7 @@
+@@ -4360,7 +4467,7 @@
     
  ; return 0; }
  EOF
--if { (eval echo configure:4359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:4364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_VOIDPOINTER 1
-@@ -4370,16 +4477,16 @@
+@@ -4375,16 +4482,16 @@
  rm -f conftest*
  
  echo $ac_n "checking for ANSI volatile""... $ac_c" 1>&6
--echo "configure:4374: checking for ANSI volatile" >&5
-+echo "configure:4481: checking for ANSI volatile" >&5
+-echo "configure:4379: checking for ANSI volatile" >&5
++echo "configure:4486: checking for ANSI volatile" >&5
  cat > conftest.$ac_ext <<EOF
--#line 4376 "configure"
-+#line 4483 "configure"
+-#line 4381 "configure"
++#line 4488 "configure"
  #include "confdefs.h"
  
  int main() {
  volatile int n;
  ; return 0; }
  EOF
--if { (eval echo configure:4383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:4388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_VOLATILE 1
-@@ -4396,12 +4503,12 @@
+@@ -4401,12 +4508,12 @@
  for ac_func in waitpid wait3
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4400: checking for $ac_func" >&5
-+echo "configure:4507: checking for $ac_func" >&5
+-echo "configure:4405: checking for $ac_func" >&5
++echo "configure:4512: 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 4405 "configure"
-+#line 4512 "configure"
+-#line 4410 "configure"
++#line 4517 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4424,7 +4531,7 @@
+@@ -4429,7 +4536,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4540: \"$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
-@@ -4449,9 +4556,9 @@
+@@ -4454,9 +4561,9 @@
  done
  
  echo $ac_n "checking for union wait""... $ac_c" 1>&6
--echo "configure:4453: checking for union wait" >&5;
-+echo "configure:4560: checking for union wait" >&5;
+-echo "configure:4458: checking for union wait" >&5;
++echo "configure:4565: checking for union wait" >&5;
  cat > conftest.$ac_ext <<EOF
--#line 4455 "configure"
-+#line 4562 "configure"
+-#line 4460 "configure"
++#line 4567 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/wait.h>
-@@ -4470,7 +4577,7 @@
+@@ -4475,7 +4582,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_UNION_WAIT 1
-@@ -4485,9 +4592,9 @@
+@@ -4490,9 +4597,9 @@
  rm -f conftest*
  
  echo $ac_n "checking sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
--echo "configure:4489: checking sys_siglist declaration in signal.h or unistd.h" >&5
-+echo "configure:4596: checking sys_siglist declaration in signal.h or unistd.h" >&5
+-echo "configure:4494: checking sys_siglist declaration in signal.h or unistd.h" >&5
++echo "configure:4601: checking sys_siglist declaration in signal.h or unistd.h" >&5
  cat > conftest.$ac_ext <<EOF
--#line 4491 "configure"
-+#line 4598 "configure"
+-#line 4496 "configure"
++#line 4603 "configure"
  #include "confdefs.h"
  #include <signal.h>
  /* NetBSD declares sys_siglist in <unistd.h>.  */
-@@ -4498,7 +4605,7 @@
+@@ -4503,7 +4610,7 @@
  char *msg = *(sys_siglist + 1);
  ; return 0; }
  EOF
--if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define SYS_SIGLIST_DECLARED 1
-@@ -4527,7 +4634,7 @@
+@@ -4532,7 +4639,7 @@
  
  
  echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:4531: checking size of short" >&5
-+echo "configure:4638: checking size of short" >&5
+-echo "configure:4536: checking size of short" >&5
++echo "configure:4643: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4535,7 +4642,7 @@
+@@ -4540,7 +4647,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4539 "configure"
-+#line 4646 "configure"
+-#line 4544 "configure"
++#line 4651 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4546,7 +4653,7 @@
+@@ -4551,7 +4658,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
-@@ -4566,7 +4673,7 @@
+@@ -4571,7 +4678,7 @@
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:4570: checking size of int" >&5
-+echo "configure:4677: checking size of int" >&5
+-echo "configure:4575: checking size of int" >&5
++echo "configure:4682: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4574,7 +4681,7 @@
+@@ -4579,7 +4686,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4578 "configure"
-+#line 4685 "configure"
+-#line 4583 "configure"
++#line 4690 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4585,7 +4692,7 @@
+@@ -4590,7 +4697,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -4605,7 +4712,7 @@
+@@ -4610,7 +4717,7 @@
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:4609: checking size of long" >&5
-+echo "configure:4716: checking size of long" >&5
+-echo "configure:4614: checking size of long" >&5
++echo "configure:4721: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4613,7 +4720,7 @@
+@@ -4618,7 +4725,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
--#line 4617 "configure"
-+#line 4724 "configure"
+-#line 4622 "configure"
++#line 4729 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
-@@ -4624,7 +4731,7 @@
+@@ -4629,7 +4736,7 @@
    exit(0);
  }
  EOF
--if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -4748,18 +4855,18 @@
+@@ -4753,18 +4860,18 @@
    enableval="$enable_opie"
     ac_safe=`echo "opie.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for opie.h""... $ac_c" 1>&6
--echo "configure:4752: checking for opie.h" >&5
-+echo "configure:4859: checking for opie.h" >&5
+-echo "configure:4757: checking for opie.h" >&5
++echo "configure:4864: checking for opie.h" >&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 4757 "configure"
-+#line 4864 "configure"
+-#line 4762 "configure"
++#line 4869 "configure"
  #include "confdefs.h"
  #include <opie.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:4767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:4869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4874: \"$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"
-@@ -4781,7 +4888,7 @@
+@@ -4786,7 +4893,7 @@
  fi
  
            echo $ac_n "checking for opiegenerator in -lopie""... $ac_c" 1>&6
--echo "configure:4785: checking for opiegenerator in -lopie" >&5
-+echo "configure:4892: checking for opiegenerator in -lopie" >&5
+-echo "configure:4790: checking for opiegenerator in -lopie" >&5
++echo "configure:4897: checking for opiegenerator in -lopie" >&5
  ac_lib_var=`echo opie'_'opiegenerator | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4789,7 +4896,7 @@
+@@ -4794,7 +4901,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lopie  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4793 "configure"
-+#line 4900 "configure"
+-#line 4798 "configure"
++#line 4905 "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
-@@ -4800,7 +4907,7 @@
+@@ -4805,7 +4912,7 @@
  opiegenerator()
  ; return 0; }
  EOF
--if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4916: \"$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
-@@ -4841,7 +4948,7 @@
+@@ -4846,7 +4953,7 @@
  if test "${enable_inet6+set}" = set; then
    enableval="$enable_inet6"
     unset ac_cv_lib_inet6_getaddrinfo; echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
--echo "configure:4845: checking for getaddrinfo in -linet6" >&5
-+echo "configure:4952: checking for getaddrinfo in -linet6" >&5
+-echo "configure:4850: checking for getaddrinfo in -linet6" >&5
++echo "configure:4957: 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
-@@ -4849,7 +4956,7 @@
+@@ -4854,7 +4961,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4853 "configure"
-+#line 4960 "configure"
+-#line 4858 "configure"
++#line 4965 "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
-@@ -4860,7 +4967,7 @@
+@@ -4865,7 +4972,7 @@
  getaddrinfo()
  ; return 0; }
  EOF
--if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:4976: \"$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
-@@ -4886,7 +4993,7 @@
+@@ -4891,7 +4998,7 @@
  else
    echo "$ac_t""no" 1>&6
   unset ac_cv_lib_inet6_getaddrinfo; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for getaddrinfo in -linet6""... $ac_c" 1>&6
--echo "configure:4890: checking for getaddrinfo in -linet6" >&5
-+echo "configure:4997: checking for getaddrinfo in -linet6" >&5
+-echo "configure:4895: checking for getaddrinfo in -linet6" >&5
++echo "configure:5002: 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
-@@ -4894,7 +5001,7 @@
+@@ -4899,7 +5006,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4898 "configure"
-+#line 5005 "configure"
+-#line 4903 "configure"
++#line 5010 "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
-@@ -4905,7 +5012,7 @@
+@@ -4910,7 +5017,7 @@
  getaddrinfo()
  ; return 0; }
  EOF
--if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5021: \"$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
-@@ -4946,7 +5053,7 @@
+@@ -4951,7 +5058,7 @@
  if test "${enable_netsec+set}" = set; then
    enableval="$enable_netsec"
     unset ac_cv_lib_inet6_net_security_strtorequest; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6
--echo "configure:4950: checking for net_security_strtorequest in -linet6" >&5
-+echo "configure:5057: checking for net_security_strtorequest in -linet6" >&5
+-echo "configure:4955: checking for net_security_strtorequest in -linet6" >&5
++echo "configure:5062: checking for net_security_strtorequest in -linet6" >&5
  ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4954,7 +5061,7 @@
+@@ -4959,7 +5066,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4958 "configure"
-+#line 5065 "configure"
+-#line 4963 "configure"
++#line 5070 "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
-@@ -4965,7 +5072,7 @@
+@@ -4970,7 +5077,7 @@
  net_security_strtorequest()
  ; return 0; }
  EOF
--if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5081: \"$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
-@@ -4991,7 +5098,7 @@
+@@ -4996,7 +5103,7 @@
  else
    echo "$ac_t""no" 1>&6
   unset ac_cv_lib_inet6_net_security_strtorequest; LDFLAGS="$LDFLAGS -L/usr/inet6/lib"; echo $ac_n "checking for net_security_strtorequest in -linet6""... $ac_c" 1>&6
--echo "configure:4995: checking for net_security_strtorequest in -linet6" >&5
-+echo "configure:5102: checking for net_security_strtorequest in -linet6" >&5
+-echo "configure:5000: checking for net_security_strtorequest in -linet6" >&5
++echo "configure:5107: checking for net_security_strtorequest in -linet6" >&5
  ac_lib_var=`echo inet6'_'net_security_strtorequest | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4999,7 +5106,7 @@
+@@ -5004,7 +5111,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-linet6  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5003 "configure"
-+#line 5110 "configure"
+-#line 5008 "configure"
++#line 5115 "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
-@@ -5010,7 +5117,7 @@
+@@ -5015,7 +5122,7 @@
  net_security_strtorequest()
  ; return 0; }
  EOF
--if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5126: \"$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
-@@ -5045,18 +5152,18 @@
+@@ -5050,18 +5157,18 @@
  
            unset ac_cv_header_net_security_h; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for net/security.h""... $ac_c" 1>&6
--echo "configure:5049: checking for net/security.h" >&5
-+echo "configure:5156: checking for net/security.h" >&5
+-echo "configure:5054: checking for net/security.h" >&5
++echo "configure:5161: checking for net/security.h" >&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 5054 "configure"
-+#line 5161 "configure"
+-#line 5059 "configure"
++#line 5166 "configure"
  #include "confdefs.h"
  #include <net/security.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:5166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5171: \"$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"
-@@ -5076,18 +5183,18 @@
+@@ -5081,18 +5188,18 @@
    echo "$ac_t""no" 1>&6
   unset ac_cv_header_net_security_h; CPPFLAGS="$CPPFLAGS -I/usr/inet6/include"; CFLAGS="$CFLAGS -I/usr/inet6/include"; ac_safe=`echo "net/security.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for net/security.h""... $ac_c" 1>&6
--echo "configure:5080: checking for net/security.h" >&5
-+echo "configure:5187: checking for net/security.h" >&5
+-echo "configure:5085: checking for net/security.h" >&5
++echo "configure:5192: checking for net/security.h" >&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 5085 "configure"
-+#line 5192 "configure"
+-#line 5090 "configure"
++#line 5197 "configure"
  #include "confdefs.h"
  #include <net/security.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:5197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5202: \"$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"
-@@ -5213,7 +5320,7 @@
+@@ -5222,7 +5329,7 @@
          LDEFLAGS="$LDEFLAGS -L$with_socks"
      else
          echo $ac_n "checking for Rconnect in -lsocks""... $ac_c" 1>&6
--echo "configure:5217: checking for Rconnect in -lsocks" >&5
-+echo "configure:5324: checking for Rconnect in -lsocks" >&5
+-echo "configure:5226: checking for Rconnect in -lsocks" >&5
++echo "configure:5333: 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
-@@ -5221,7 +5328,7 @@
+@@ -5230,7 +5337,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocks  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5225 "configure"
-+#line 5332 "configure"
+-#line 5234 "configure"
++#line 5341 "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
-@@ -5232,7 +5339,7 @@
+@@ -5241,7 +5348,7 @@
  Rconnect()
  ; return 0; }
  EOF
--if { (eval echo configure:5236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5352: \"$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
-@@ -5286,7 +5393,7 @@
+@@ -5295,7 +5402,7 @@
      LDEFLAGS="$LDEFLAGS -L$with_hesiod/lib"
      LIBS="$LIBS -lhesiod"
  else
@@ -2501,61 +2501,61 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      do
        if test -f "$dir/include/hesiod.h"
        then
-@@ -5317,7 +5424,7 @@
+@@ -5327,7 +5434,7 @@
    fi
  
    echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6
--echo "configure:5321: checking for krb5_init_context in -lkrb5" >&5
-+echo "configure:5428: checking for krb5_init_context in -lkrb5" >&5
+-echo "configure:5331: checking for krb5_init_context in -lkrb5" >&5
++echo "configure:5438: checking for krb5_init_context in -lkrb5" >&5
  ac_lib_var=`echo krb5'_'krb5_init_context | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5325,7 +5432,7 @@
+@@ -5335,7 +5442,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lkrb5  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5329 "configure"
-+#line 5436 "configure"
+-#line 5339 "configure"
++#line 5446 "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
-@@ -5336,7 +5443,7 @@
+@@ -5346,7 +5453,7 @@
  krb5_init_context()
  ; return 0; }
  EOF
--if { (eval echo configure:5340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5457: \"$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
-@@ -5365,7 +5472,7 @@
+@@ -5375,7 +5482,7 @@
  fi
  
    echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
--echo "configure:5369: checking for gss_init_sec_context in -lgssapi_krb5" >&5
-+echo "configure:5476: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+-echo "configure:5379: checking for gss_init_sec_context in -lgssapi_krb5" >&5
++echo "configure:5486: checking for gss_init_sec_context in -lgssapi_krb5" >&5
  ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5373,7 +5480,7 @@
+@@ -5383,7 +5490,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lgssapi_krb5 -lkrb5 $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5377 "configure"
-+#line 5484 "configure"
+-#line 5387 "configure"
++#line 5494 "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
-@@ -5384,7 +5491,7 @@
+@@ -5394,7 +5501,7 @@
  gss_init_sec_context()
  ; return 0; }
  EOF
--if { (eval echo configure:5388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5505: \"$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
-@@ -5444,7 +5551,7 @@
+@@ -5454,7 +5561,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 |
@@ -2564,7 +2564,7 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
-@@ -5511,7 +5618,7 @@
+@@ -5521,7 +5628,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)
@@ -2573,7 +2573,7 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
-@@ -5531,9 +5638,11 @@
+@@ -5541,9 +5648,11 @@
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
@@ -2585,7 +2585,7 @@ $NetBSD: patch-ad,v 1.2 1999/02/03 13:00:18 frueauf Exp $
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
-@@ -5559,6 +5668,7 @@
+@@ -5569,6 +5678,7 @@
  s%@host_os@%$host_os%g
  s%@CC@%$CC%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g