From d9aa6bbdf239b6e31281c61a97cdbf2c242c1186 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 11 May 1999 20:24:46 +0000
Subject: Nuke check for "gdbm" library from "configure" which is not needed
 but can be found by mistake. Problem noted by Dean Huxley.

---
 mail/qpopper/patches/patch-ac | 1024 ++--------------------------------
 mail/qpopper/patches/patch-ag | 1209 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 1211 insertions(+), 1022 deletions(-)

(limited to 'mail/qpopper')

diff --git a/mail/qpopper/patches/patch-ac b/mail/qpopper/patches/patch-ac
index 203fe193309..6b3558c7b1d 100644
--- a/mail/qpopper/patches/patch-ac
+++ b/mail/qpopper/patches/patch-ac
@@ -1,991 +1,35 @@
-$NetBSD: patch-ac,v 1.6 1998/08/07 11:09:53 agc Exp $
+$NetBSD: patch-ac,v 1.7 1999/05/11 20:24:46 tron Exp $
 
-*** configure.orig	Fri Jul 10 01:44:06 1998
---- configure	Wed Jul 22 16:37:43 1998
-***************
-*** 838,844 ****
-  fi
-  if test "$GCC" = yes 
-  then
-! 	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
-  fi
-  
-  
---- 838,844 ----
-  fi
-  if test "$GCC" = yes 
-  then
-! 	CFLAGS="$CFLAGS -fstrength-reduce "
-  fi
-  
-  
-***************
-*** 1511,1516 ****
---- 1511,1519 ----
-  syslog.h \
-  net/errno.h \
-  unistd.h \
-+ stdlib.h \
-+ string.h \
-+ time.h \
-  netinet/in.h \
-  maillock.h \
-  ndbm.h \
-***************
-*** 1521,1537 ****
-  do
-  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-! echo "configure:1525: 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 1530 "configure"
-  #include "confdefs.h"
-  #include <$ac_hdr>
-  EOF
-  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-! { (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-  ac_err=`grep -v '^ *+' conftest.out`
-  if test -z "$ac_err"; then
-    rm -rf conftest*
---- 1524,1540 ----
-  do
-  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-! echo "configure:1528: 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 1533 "configure"
-  #include "confdefs.h"
-  #include <$ac_hdr>
-  EOF
-  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-! { (eval echo configure:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-  ac_err=`grep -v '^ *+' conftest.out`
-  if test -z "$ac_err"; then
-    rm -rf conftest*
-***************
-*** 1560,1566 ****
-  
-  
-  echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-! echo "configure:1564: checking for t_accept in -lnsl" >&5
-  ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1563,1569 ----
-  
-  
-  echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-! echo "configure:1567: checking for t_accept in -lnsl" >&5
-  ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1568,1574 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lnsl  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1572 "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
---- 1571,1577 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lnsl  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1575 "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
-***************
-*** 1579,1585 ****
-  t_accept()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1582,1588 ----
-  t_accept()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1600,1606 ****
-  fi
-  
-  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-! echo "configure:1604: 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
---- 1603,1609 ----
-  fi
-  
-  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-! echo "configure:1607: 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
-***************
-*** 1608,1614 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lsocket  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1612 "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
---- 1611,1617 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lsocket  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1615 "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
-***************
-*** 1619,1625 ****
-  socket()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1622,1628 ----
-  socket()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1640,1646 ****
-  fi
-  
-  echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6
-! echo "configure:1644: checking for res_init in -lresolv" >&5
-  ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1643,1649 ----
-  fi
-  
-  echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6
-! echo "configure:1647: checking for res_init in -lresolv" >&5
-  ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1648,1654 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lresolv  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1652 "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
---- 1651,1657 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lresolv  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1655 "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
-***************
-*** 1659,1665 ****
-  res_init()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1662,1668 ----
-  res_init()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1680,1686 ****
-  fi
-  
-  echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
-! echo "configure:1684: checking for maillock in -lmail" >&5
-  ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1683,1689 ----
-  fi
-  
-  echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
-! echo "configure:1687: checking for maillock in -lmail" >&5
-  ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1688,1694 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lmail  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1692 "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
---- 1691,1697 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lmail  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1695 "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
-***************
-*** 1699,1705 ****
-  maillock()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1702,1708 ----
-  maillock()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1723,1729 ****
-  fi
-  
-  echo $ac_n "checking for krb_recvauth in -lkrb""... $ac_c" 1>&6
-! echo "configure:1727: checking for krb_recvauth in -lkrb" >&5
-  ac_lib_var=`echo krb'_'krb_recvauth | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1726,1732 ----
-  fi
-  
-  echo $ac_n "checking for krb_recvauth in -lkrb""... $ac_c" 1>&6
-! echo "configure:1730: checking for krb_recvauth in -lkrb" >&5
-  ac_lib_var=`echo krb'_'krb_recvauth | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1731,1737 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lkrb  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1735 "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
---- 1734,1740 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lkrb  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1738 "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
-***************
-*** 1742,1748 ****
-  krb_recvauth()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1745,1751 ----
-  krb_recvauth()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1757,1769 ****
-  fi
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!   KERBEROS_LIBS="$KERBEROS_LIBS -lkrb"
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-  
-  echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
-! echo "configure:1767: checking for dbm_open in -lndbm" >&5
-  ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1760,1775 ----
-  fi
-  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-    echo "$ac_t""yes" 1>&6
-!   KERBEROS_LIBS="$KERBEROS_LIBS -lkrb"; cat >> confdefs.h <<\EOF
-! #define KERBEROS 1
-! EOF
-! 
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-  
-  echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
-! echo "configure:1773: checking for dbm_open in -lndbm" >&5
-  ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1771,1777 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lndbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1775 "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
---- 1777,1783 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lndbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1781 "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
-***************
-*** 1782,1788 ****
-  dbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1788,1794 ----
-  dbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1803,1809 ****
-  fi
-  
-  echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-! echo "configure:1807: checking for dbm_open in -ldbm" >&5
-  ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1809,1815 ----
-  fi
-  
-  echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-! echo "configure:1813: checking for dbm_open in -ldbm" >&5
-  ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1811,1817 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-ldbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1815 "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
---- 1817,1823 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-ldbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1821 "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
-***************
-*** 1822,1828 ****
-  dbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1828,1834 ----
-  dbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1843,1849 ****
-  fi
-  
-  echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-! echo "configure:1847: checking for gdbm_open in -lgdbm" >&5
-  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1849,1855 ----
-  fi
-  
-  echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
-! echo "configure:1853: checking for gdbm_open in -lgdbm" >&5
-  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1851,1857 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lgdbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1855 "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
---- 1857,1863 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lgdbm  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1861 "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
-***************
-*** 1862,1868 ****
-  gdbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1868,1874 ----
-  gdbm_open()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1886,1892 ****
-  fi
-  
-  echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
-! echo "configure:1890: checking for set_auth_parameters in -lsecurity" >&5
-  ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1892,1898 ----
-  fi
-  
-  echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
-! echo "configure:1896: checking for set_auth_parameters in -lsecurity" >&5
-  ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1894,1900 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lsecurity  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1898 "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
---- 1900,1906 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lsecurity  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1904 "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
-***************
-*** 1905,1911 ****
-  set_auth_parameters()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1911,1917 ----
-  set_auth_parameters()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1926,1932 ****
-  fi
-  
-  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-! echo "configure:1930: checking for crypt in -lcrypt" >&5
-  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1932,1938 ----
-  fi
-  
-  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-! echo "configure:1936: checking for crypt in -lcrypt" >&5
-  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1934,1940 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lcrypt  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1938 "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
---- 1940,1946 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lcrypt  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1944 "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
-***************
-*** 1945,1951 ****
-  crypt()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1951,1957 ----
-  crypt()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 1966,1972 ****
-  fi
-  
-  echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-! echo "configure:1970: checking for pw_encrypt in -lshadow" >&5
-  ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
---- 1972,1978 ----
-  fi
-  
-  echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-! echo "configure:1976: checking for pw_encrypt in -lshadow" >&5
-  ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
-  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-***************
-*** 1974,1980 ****
-    ac_save_LIBS="$LIBS"
-  LIBS="-lshadow  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1978 "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
---- 1980,1986 ----
-    ac_save_LIBS="$LIBS"
-  LIBS="-lshadow  $LIBS"
-  cat > conftest.$ac_ext <<EOF
-! #line 1984 "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
-***************
-*** 1985,1991 ****
-  pw_encrypt()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
---- 1991,1997 ----
-  pw_encrypt()
-  ; return 0; }
-  EOF
-! if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_lib_$ac_lib_var=yes"
-  else
-***************
-*** 2013,2024 ****
-  
-  
-  echo $ac_n "checking for working const""... $ac_c" 1>&6
-! echo "configure:2017: checking for working const" >&5
-  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2022 "configure"
-  #include "confdefs.h"
-  
-  int main() {
---- 2019,2030 ----
-  
-  
-  echo $ac_n "checking for working const""... $ac_c" 1>&6
-! echo "configure:2023: checking for working const" >&5
-  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2028 "configure"
-  #include "confdefs.h"
-  
-  int main() {
-***************
-*** 2067,2073 ****
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_c_const=yes
-  else
---- 2073,2079 ----
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_c_const=yes
-  else
-***************
-*** 2088,2099 ****
-  fi
-  
-  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-! echo "configure:2092: checking for uid_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2097 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  EOF
---- 2094,2105 ----
-  fi
-  
-  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-! echo "configure:2098: checking for uid_t in sys/types.h" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2103 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  EOF
-***************
-*** 2122,2133 ****
-  fi
-  
-  echo $ac_n "checking for off_t""... $ac_c" 1>&6
-! echo "configure:2126: 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 2131 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #if STDC_HEADERS
---- 2128,2139 ----
-  fi
-  
-  echo $ac_n "checking for off_t""... $ac_c" 1>&6
-! echo "configure:2132: 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 2137 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #if STDC_HEADERS
-***************
-*** 2155,2166 ****
-  fi
-  
-  echo $ac_n "checking for size_t""... $ac_c" 1>&6
-! echo "configure:2159: checking for size_t" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2164 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #if STDC_HEADERS
---- 2161,2172 ----
-  fi
-  
-  echo $ac_n "checking for size_t""... $ac_c" 1>&6
-! echo "configure:2165: checking for size_t" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2170 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #if STDC_HEADERS
-***************
-*** 2188,2199 ****
-  fi
-  
-  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-! echo "configure:2192: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2197 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #include <signal.h>
---- 2194,2205 ----
-  fi
-  
-  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-! echo "configure:2198: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2203 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #include <signal.h>
-***************
-*** 2205,2211 ****
-  char *msg = *(sys_siglist + 1);
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_decl_sys_siglist=yes
-  else
---- 2211,2217 ----
-  char *msg = *(sys_siglist + 1);
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_decl_sys_siglist=yes
-  else
-***************
-*** 2227,2238 ****
-  
-  
-  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-! echo "configure:2231: checking return type of signal handlers" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2236 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #include <signal.h>
---- 2233,2244 ----
-  
-  
-  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-! echo "configure:2237: checking return type of signal handlers" >&5
-  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
-    cat > conftest.$ac_ext <<EOF
-! #line 2242 "configure"
-  #include "confdefs.h"
-  #include <sys/types.h>
-  #include <signal.h>
-***************
-*** 2249,2255 ****
-  int i;
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_type_signal=void
-  else
---- 2255,2261 ----
-  int i;
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    rm -rf conftest*
-    ac_cv_type_signal=void
-  else
-***************
-*** 2268,2279 ****
-  
-  
-  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-! echo "configure:2272: 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 2277 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char vprintf(); below.  */
---- 2274,2285 ----
-  
-  
-  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-! echo "configure:2278: 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 2283 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char vprintf(); below.  */
-***************
-*** 2296,2302 ****
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func_vprintf=yes"
-  else
---- 2302,2308 ----
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func_vprintf=yes"
-  else
-***************
-*** 2320,2331 ****
-  
-  if test "$ac_cv_func_vprintf" != yes; then
-  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-! echo "configure:2324: 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 2329 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char _doprnt(); below.  */
---- 2326,2337 ----
-  
-  if test "$ac_cv_func_vprintf" != yes; then
-  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-! echo "configure:2330: 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 2335 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char _doprnt(); below.  */
-***************
-*** 2348,2354 ****
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func__doprnt=yes"
-  else
---- 2354,2360 ----
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func__doprnt=yes"
-  else
-***************
-*** 2386,2397 ****
-  
-  do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-! echo "configure:2390: 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 2395 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char $ac_func(); below.  */
---- 2392,2403 ----
-  
-  do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-! echo "configure:2396: 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 2401 "configure"
-  #include "confdefs.h"
-  /* System header to define __stub macros and hopefully few prototypes,
-      which can conflict with char $ac_func(); below.  */
-***************
-*** 2414,2420 ****
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func_$ac_func=yes"
-  else
---- 2420,2426 ----
-  
-  ; return 0; }
-  EOF
-! if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-    rm -rf conftest*
-    eval "ac_cv_func_$ac_func=yes"
-  else
+--- configure.in.orig	Fri Jul 10 01:44:06 1998
++++ configure.in	Tue May 11 22:11:08 1999
+@@ -13,7 +13,7 @@
+ fi
+ if test "$GCC" = yes 
+ then
+-	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
++	CFLAGS="$CFLAGS -fstrength-reduce "
+ fi
+ AC_SUBST(CC)
+ AC_SUBST(CFLAGS)
+@@ -195,10 +195,12 @@
+ syslog.h \
+ net/errno.h \
+ unistd.h \
++stdlib.h \
++string.h \
++time.h \
+ netinet/in.h \
+ maillock.h \
+ ndbm.h \
+-gdbm.h \
+ dbm.h \
+ shadow.h \
+ )
+@@ -212,7 +214,6 @@
+ AC_CHECK_LIB(krb, krb_recvauth, KERBEROS_LIBS="$KERBEROS_LIBS -lkrb")
+ AC_CHECK_LIB(ndbm, dbm_open, DBM_LIBS="-lndbm")
+ AC_CHECK_LIB(dbm, dbm_open, DBM_LIBS="-ldbm")
+-AC_CHECK_LIB(gdbm, gdbm_open, DBM_LIBS="-lgdbm"; AC_DEFINE(GDBM))
+ AC_CHECK_LIB(security, set_auth_parameters, LIBS="$LIBS -lsecurity")
+ AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
+ AC_CHECK_LIB(shadow, pw_encrypt, LIBS="$LIBS -lshadow")
diff --git a/mail/qpopper/patches/patch-ag b/mail/qpopper/patches/patch-ag
index 99894f9c403..4c6a338b6f2 100644
--- a/mail/qpopper/patches/patch-ag
+++ b/mail/qpopper/patches/patch-ag
@@ -1,33 +1,1178 @@
-$NetBSD: patch-ag,v 1.3 1998/08/07 11:09:54 agc Exp $
+$NetBSD: patch-ag,v 1.4 1999/05/11 20:24:46 tron Exp $
 
-*** configure.in.orig	Fri Jul 10 01:44:06 1998
---- configure.in	Wed Jul 22 16:37:33 1998
-***************
-*** 13,19 ****
-  fi
-  if test "$GCC" = yes 
-  then
-! 	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
-  fi
-  AC_SUBST(CC)
-  AC_SUBST(CFLAGS)
---- 13,19 ----
-  fi
-  if test "$GCC" = yes 
-  then
-! 	CFLAGS="$CFLAGS -fstrength-reduce "
-  fi
-  AC_SUBST(CC)
-  AC_SUBST(CFLAGS)
-***************
-*** 195,200 ****
---- 195,203 ----
-  syslog.h \
-  net/errno.h \
-  unistd.h \
-+ stdlib.h \
-+ string.h \
-+ time.h \
-  netinet/in.h \
-  maillock.h \
-  ndbm.h \
+--- configure.orig	Fri Jul 10 01:44:06 1998
++++ configure	Tue May 11 22:12:01 1999
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ 
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.12 
++# Generated automatically using autoconf version 2.13 
+ # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -61,6 +61,7 @@
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
+ # Maximum number of lines to put in a shell here document.
+ ac_max_here_lines=12
+ 
+@@ -344,7 +345,7 @@
+     verbose=yes ;;
+ 
+   -version | --version | --versio | --versi | --vers)
+-    echo "configure generated by autoconf version 2.12"
++    echo "configure generated by autoconf version 2.13"
+     exit 0 ;;
+ 
+   -with-* | --with-*)
+@@ -514,9 +515,11 @@
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
++ac_exeext=
++ac_objext=o
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -533,7 +536,7 @@
+ 
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:537: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:540: 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
+@@ -562,15 +565,16 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:566: checking for $ac_word" >&5
++echo "configure:569: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_CC="gcc"
+@@ -591,16 +595,17 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:595: checking for $ac_word" >&5
++echo "configure:599: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+-  for ac_dir in $PATH; do
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+@@ -635,25 +640,61 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:650: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++ ;;
++    esac
++  fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:643: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:682: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 653 "configure"
++cat > conftest.$ac_ext << EOF
++
++#line 693 "configure"
+ #include "confdefs.h"
++
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -667,18 +708,24 @@
+   ac_cv_prog_cc_works=no
+ fi
+ rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:677: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:724: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:682: checking whether we are using GNU C" >&5
++echo "configure:729: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -687,7 +734,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -698,11 +745,15 @@
+ 
+ if test $ac_cv_prog_gcc = yes; then
+   GCC=yes
+-  ac_test_CFLAGS="${CFLAGS+set}"
+-  ac_save_CFLAGS="$CFLAGS"
+-  CFLAGS=
+-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:706: checking whether ${CC-cc} accepts -g" >&5
++else
++  GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:757: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -717,20 +768,24 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-  if test "$ac_test_CFLAGS" = set; then
+-    CFLAGS="$ac_save_CFLAGS"
+-  elif test $ac_cv_prog_cc_g = yes; then
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
+     CFLAGS="-g -O2"
+   else
+-    CFLAGS="-O2"
++    CFLAGS="-g"
+   fi
+ else
+-  GCC=
+-  test "${CFLAGS+set}" = set || CFLAGS="-g"
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:734: checking for POSIXized ISC" >&5
++echo "configure:789: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ then
+@@ -753,7 +808,7 @@
+ if test "$ISC" = yes 
+ then
+ 	echo $ac_n "checking for main in -lcposix""... $ac_c" 1>&6
+-echo "configure:757: checking for main in -lcposix" >&5
++echo "configure:812: checking for main in -lcposix" >&5
+ ac_lib_var=`echo cposix'_'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
+@@ -761,14 +816,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 765 "configure"
++#line 820 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:827: \"$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
+@@ -796,7 +851,7 @@
+ fi
+ 
+ 	echo $ac_n "checking for bzero in -linet""... $ac_c" 1>&6
+-echo "configure:800: checking for bzero in -linet" >&5
++echo "configure:855: checking for bzero in -linet" >&5
+ ac_lib_var=`echo inet'_'bzero | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -804,7 +859,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 808 "configure"
++#line 863 "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
+@@ -815,7 +870,7 @@
+ bzero()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:874: \"$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
+@@ -838,7 +893,7 @@
+ fi
+ if test "$GCC" = yes 
+ then
+-	CFLAGS="$CFLAGS -fstrength-reduce -fpcc-struct-return "
++	CFLAGS="$CFLAGS -fstrength-reduce "
+ fi
+ 
+ 
+@@ -1014,7 +1069,7 @@
+ 
+ 
+ echo $ac_n "checking size of unsigned long int""... $ac_c" 1>&6
+-echo "configure:1018: checking size of unsigned long int" >&5
++echo "configure:1073: checking size of unsigned long int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1022,7 +1077,7 @@
+   ac_cv_sizeof_unsigned_long_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1026 "configure"
++#line 1081 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -1033,7 +1088,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:1037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_long_int=`cat conftestval`
+ else
+@@ -1054,7 +1109,7 @@
+ 
+ 
+ echo $ac_n "checking for sendmail program""... $ac_c" 1>&6
+-echo "configure:1058: checking for sendmail program" >&5
++echo "configure:1113: checking for sendmail program" >&5
+ if test -x /usr/sbin/sendmail
+ then
+ 	cat >> confdefs.h <<\EOF
+@@ -1081,7 +1136,7 @@
+ 	exit 1
+ fi
+ echo $ac_n "checking for mail spool directory""... $ac_c" 1>&6
+-echo "configure:1085: checking for mail spool directory" >&5
++echo "configure:1140: checking for mail spool directory" >&5
+ if test -d /usr/mail
+ then
+ 	cat >> confdefs.h <<\EOF
+@@ -1164,7 +1219,7 @@
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1168: checking how to run the C preprocessor" >&5
++echo "configure:1223: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1179,14 +1234,14 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1183 "configure"
++#line 1238 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -1196,14 +1251,31 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1200 "configure"
++#line 1255 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 1272 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+@@ -1216,6 +1288,8 @@
+ rm -f conftest*
+ fi
+ rm -f conftest*
++fi
++rm -f conftest*
+   ac_cv_prog_CPP="$CPP"
+ fi
+   CPP="$ac_cv_prog_CPP"
+@@ -1225,12 +1299,12 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1229: checking for ANSI C header files" >&5
++echo "configure:1303: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1234 "configure"
++#line 1308 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1238,8 +1312,8 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   ac_cv_header_stdc=yes
+@@ -1255,7 +1329,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1259 "configure"
++#line 1333 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1273,7 +1347,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1277 "configure"
++#line 1351 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1294,7 +1368,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1298 "configure"
++#line 1372 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1305,7 +1379,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1333,12 +1407,12 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:1337: checking for $ac_hdr that defines DIR" >&5
++echo "configure:1411: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1342 "configure"
++#line 1416 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -1346,7 +1420,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -1371,7 +1445,7 @@
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:1375: checking for opendir in -ldir" >&5
++echo "configure:1449: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1379,7 +1453,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1383 "configure"
++#line 1457 "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
+@@ -1390,7 +1464,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1468: \"$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
+@@ -1412,7 +1486,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:1416: checking for opendir in -lx" >&5
++echo "configure:1490: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1420,7 +1494,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1424 "configure"
++#line 1498 "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
+@@ -1431,7 +1505,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1509: \"$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
+@@ -1454,12 +1528,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:1458: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:1532: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1463 "configure"
++#line 1537 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -1475,7 +1549,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -1511,28 +1585,30 @@
+ syslog.h \
+ net/errno.h \
+ unistd.h \
++stdlib.h \
++string.h \
++time.h \
+ netinet/in.h \
+ maillock.h \
+ ndbm.h \
+-gdbm.h \
+ dbm.h \
+ shadow.h \
+ 
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1525: checking for $ac_hdr" >&5
++echo "configure:1601: 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 1530 "configure"
++#line 1606 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:1611: \"$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"
+@@ -1560,7 +1636,7 @@
+ 
+ 
+ echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
+-echo "configure:1564: checking for t_accept in -lnsl" >&5
++echo "configure:1640: checking for t_accept in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1568,7 +1644,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1572 "configure"
++#line 1648 "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
+@@ -1579,7 +1655,7 @@
+ t_accept()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1659: \"$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
+@@ -1600,7 +1676,7 @@
+ fi
+ 
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:1604: checking for socket in -lsocket" >&5
++echo "configure:1680: 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
+@@ -1608,7 +1684,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1612 "configure"
++#line 1688 "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
+@@ -1619,7 +1695,7 @@
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1699: \"$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
+@@ -1640,7 +1716,7 @@
+ fi
+ 
+ echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6
+-echo "configure:1644: checking for res_init in -lresolv" >&5
++echo "configure:1720: checking for res_init in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'res_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1648,7 +1724,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lresolv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1652 "configure"
++#line 1728 "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
+@@ -1659,7 +1735,7 @@
+ res_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1739: \"$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
+@@ -1680,7 +1756,7 @@
+ fi
+ 
+ echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
+-echo "configure:1684: checking for maillock in -lmail" >&5
++echo "configure:1760: checking for maillock in -lmail" >&5
+ ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1688,7 +1764,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmail  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1692 "configure"
++#line 1768 "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
+@@ -1699,7 +1775,7 @@
+ maillock()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1779: \"$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
+@@ -1723,7 +1799,7 @@
+ fi
+ 
+ echo $ac_n "checking for krb_recvauth in -lkrb""... $ac_c" 1>&6
+-echo "configure:1727: checking for krb_recvauth in -lkrb" >&5
++echo "configure:1803: checking for krb_recvauth in -lkrb" >&5
+ ac_lib_var=`echo krb'_'krb_recvauth | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1731,7 +1807,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkrb  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1735 "configure"
++#line 1811 "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
+@@ -1742,7 +1818,7 @@
+ krb_recvauth()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1822: \"$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
+@@ -1763,7 +1839,7 @@
+ fi
+ 
+ echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
+-echo "configure:1767: checking for dbm_open in -lndbm" >&5
++echo "configure:1843: checking for dbm_open in -lndbm" >&5
+ ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1771,7 +1847,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lndbm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1775 "configure"
++#line 1851 "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
+@@ -1782,7 +1858,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1862: \"$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
+@@ -1803,7 +1879,7 @@
+ fi
+ 
+ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
+-echo "configure:1807: checking for dbm_open in -ldbm" >&5
++echo "configure:1883: checking for dbm_open in -ldbm" >&5
+ ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1811,7 +1887,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldbm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1815 "configure"
++#line 1891 "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
+@@ -1822,7 +1898,7 @@
+ dbm_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1902: \"$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
+@@ -1842,51 +1918,8 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
+-echo "configure:1847: checking for gdbm_open in -lgdbm" >&5
+-ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lgdbm  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1855 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char gdbm_open();
+-
+-int main() {
+-gdbm_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  DBM_LIBS="-lgdbm"; cat >> confdefs.h <<\EOF
+-#define GDBM 1
+-EOF
+-
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+ echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
+-echo "configure:1890: checking for set_auth_parameters in -lsecurity" >&5
++echo "configure:1923: checking for set_auth_parameters in -lsecurity" >&5
+ ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1894,7 +1927,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1898 "configure"
++#line 1931 "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
+@@ -1905,7 +1938,7 @@
+ set_auth_parameters()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1942: \"$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
+@@ -1926,7 +1959,7 @@
+ fi
+ 
+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:1930: checking for crypt in -lcrypt" >&5
++echo "configure:1963: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1934,7 +1967,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1938 "configure"
++#line 1971 "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
+@@ -1945,7 +1978,7 @@
+ crypt()
+ ; 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:1982: \"$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
+@@ -1966,7 +1999,7 @@
+ fi
+ 
+ echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
+-echo "configure:1970: checking for pw_encrypt in -lshadow" >&5
++echo "configure:2003: checking for pw_encrypt in -lshadow" >&5
+ ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1974,7 +2007,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lshadow  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1978 "configure"
++#line 2011 "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
+@@ -1985,7 +2018,7 @@
+ pw_encrypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2022: \"$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
+@@ -2013,12 +2046,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2017: checking for working const" >&5
++echo "configure:2050: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2022 "configure"
++#line 2055 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2067,7 +2100,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -2088,12 +2121,12 @@
+ fi
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:2092: checking for uid_t in sys/types.h" >&5
++echo "configure:2125: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2097 "configure"
++#line 2130 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -2122,12 +2155,12 @@
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:2126: checking for off_t" >&5
++echo "configure:2159: 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 2131 "configure"
++#line 2164 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2136,7 +2169,7 @@
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_off_t=yes
+ else
+@@ -2155,12 +2188,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2159: checking for size_t" >&5
++echo "configure:2192: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2164 "configure"
++#line 2197 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2169,7 +2202,7 @@
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_size_t=yes
+ else
+@@ -2188,12 +2221,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
+-echo "configure:2192: checking for sys_siglist declaration in signal.h or unistd.h" >&5
++echo "configure:2225: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2197 "configure"
++#line 2230 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2205,7 +2238,7 @@
+ char *msg = *(sys_siglist + 1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_decl_sys_siglist=yes
+ else
+@@ -2227,12 +2260,12 @@
+ 
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:2231: checking return type of signal handlers" >&5
++echo "configure:2264: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2236 "configure"
++#line 2269 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -2249,7 +2282,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -2268,12 +2301,12 @@
+ 
+ 
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2272: checking for vprintf" >&5
++echo "configure:2305: 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 2277 "configure"
++#line 2310 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vprintf(); below.  */
+@@ -2296,7 +2329,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2333: \"$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
+@@ -2320,12 +2353,12 @@
+ 
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2324: checking for _doprnt" >&5
++echo "configure:2357: 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 2329 "configure"
++#line 2362 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt(); below.  */
+@@ -2348,7 +2381,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2385: \"$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
+@@ -2386,12 +2419,12 @@
+ 
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2390: checking for $ac_func" >&5
++echo "configure:2423: 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 2395 "configure"
++#line 2428 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2414,7 +2447,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2451: \"$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
+@@ -2463,7 +2496,7 @@
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+ (set) 2>&1 |
+-  case `(ac_space=' '; set) 2>&1` in
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+   *ac_space=\ *)
+     # `set' does not quote correctly, so add quotes (double-quote substitution
+     # turns \\\\ into \\, and sed turns \\ into \).
+@@ -2530,7 +2563,7 @@
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+     exit 0 ;;
+   -help | --help | --hel | --he | --h)
+     echo "\$ac_cs_usage"; exit 0 ;;
+@@ -2549,9 +2582,11 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+ s%@LIBS@%$LIBS%g
-- 
cgit v1.2.3