upgrade ucd-snmp to 4.0.1.

include IPv6 MIB support patch into compilation.
author: itojun <itojun@pkgsrc.org> 2000-01-23 10:41:09 +0000
committer: itojun <itojun@pkgsrc.org> 2000-01-23 10:41:09 +0000
commit: 7a526062c8d90fab60f499788f098b4a5c7506ee (patch)
tree: 882bea5f9e75f5114663cc1b82341c0c5162fd39 /net
parent: 49e253fff1d490da3697b8eac63ad0442d5f6a51 (diff)
download: pkgsrc-7a526062c8d90fab60f499788f098b4a5c7506ee.tar.gz
12 files changed, 3082 insertions, 258 deletions
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 530537dd7da..5d734b6436c 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,20 +1,34 @@
-# $NetBSD: Makefile,v 1.14 1999/08/15 11:07:13 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/01/23 10:41:09 itojun Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
-DISTNAME=	ucd-snmp-3.6.1
-PKGNAME=	ucd-snmp-3.6.1p1
+DISTNAME=	ucd-snmp-4.0.1
+PKGNAME=	ucd-snmp-4.0.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/
+		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
+		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
+
+PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES=	ucd-snmp-4.0.1-v6-20000121a.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.ece.ucdavis.edu/ucd-snmp/
+HOMEPAGE=	http://ucd-snmp.ucdavis.edu/
+
+BUILD_DEFS+=	USE_INET6
+.include "../../mk/bsd.prefs.mk"
 
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-defaults --with-libwrap --with-logfile="/var/log/snmpd"
+CONFIGURE_ARGS+=--enable-shared
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+CONFIGURE_ARGS+=--enable-ipv6
+.else
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
 
 # this might make it easier to use scotty's mibs, and local ones too
 CONFIGURE_ARGS+=--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
@@ -29,8 +43,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/* ${PREFIX}/share/examples/ucd-snmp
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod
 
-.include "../../mk/bsd.prefs.mk"
-
 .if (${OPSYS} == "NetBSD")
 CFLAGS+=	-Dnetbsd1
 .endif
diff --git a/net/ucd-snmp/files/md5 b/net/ucd-snmp/files/md5
index 7f4dbaa38b9..297c0234145 100644
--- a/net/ucd-snmp/files/md5
+++ b/net/ucd-snmp/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.6 1999/04/05 00:59:08 hubertf Exp $
+$NetBSD: md5,v 1.7 2000/01/23 10:41:10 itojun Exp $
 
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511
+MD5 (ucd-snmp-4.0.1-v6-20000121a.diff.gz) = 3244e4e34abe212eca6370b4bbfa054f
diff --git a/net/ucd-snmp/files/patch-sum b/net/ucd-snmp/files/patch-sum
index eccb2abcf5a..333503f312c 100644
--- a/net/ucd-snmp/files/patch-sum
+++ b/net/ucd-snmp/files/patch-sum
@@ -1,9 +1,10 @@
-$NetBSD: patch-sum,v 1.4 1999/08/15 11:07:14 tron Exp $
+<<<<<<< patch-sum
 
-MD5 (patch-aa) = c681fd865ec75d7a09ecc55630381e5d
-MD5 (patch-ab) = a690180421173141cfa23c55630bbdb9
-MD5 (patch-ac) = 9abe56a6a7600da8725526c9aa3cf9ff
-MD5 (patch-ad) = 528264880b88988e2febf0e5cf96e60b
-MD5 (patch-ae) = 7506a27cc308c926396420830c5274fe
-MD5 (patch-af) = dbe74f9fd37bd9ab3d0e75ebf884866e
-MD5 (patch-ag) = b128565e3df18c11d1e88f4a631ac4fa
+MD5 (patch-aa) = 2b9de19076a4b6d7659410a13c0c2462
+MD5 (patch-ab) = 987a91e4342366ad14270597057310f5
+MD5 (patch-ac) = 189c05afa2b17c43454bf556bca6719b
+MD5 (patch-ad) = aa019550f1295b3fe9104932af25ce73
+MD5 (patch-ae) = 2e8ca1b22c15f96c8059d7b326abcbf2
+MD5 (patch-af) = c674692801da6be008e0c4b62893ed05
+MD5 (patch-ag) = aeb3b84bbca7d08b102ceca41ea49aa9
+MD5 (patch-ah) = e54afdfa48f64e1b9d40e20839db5010
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa
index 479f68c7439..59f7c08eb51 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-aa
@@ -1,171 +1,2948 @@
-$NetBSD: patch-aa,v 1.8 1999/06/14 16:04:02 kim Exp $
-
---- configure.orig	Mon Mar 15 19:27:31 1999
-+++ configure	Mon Jun 14 11:50:06 1999
-@@ -744,7 +744,7 @@
-   if test "x$withval" != "x" -a -d "$withval"; then
-         LIBS="-L$withval -lwrap $LIBS"
-     elif test "x$withval" = "xyes"; then
--        LIBS="-lwrap $LIBS"
-+        LIBWRAP="-lwrap"
+$NetBSD: patch-aa,v 1.9 2000/01/23 10:41:10 itojun Exp $
+--- configure.in.orig	Fri Jan 21 07:52:17 2000
++++ configure.in	Fri Jan 21 08:04:52 2000
+@@ -407,7 +407,8 @@
      else
-         LIBS="$withval $LIBS"
+       SHLIB_CFLAGS="-Kpic"
      fi
-@@ -1821,9 +1821,10 @@
+-    SHLIB_EXTENSION="so"
++#   SHLIB_EXTENSION="so"
++    SHLIB_EXTENSION="la"
+ 	SHLIB_VERSION=
+     SHLIB_LD_CMD="ld -r -o"
+     SHLIB_LDCONFIG_CMD=
+@@ -712,7 +713,7 @@
+ done
+ module_list_o=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.o /g'`
+ module_list_c=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.c /g'`
+-mibgroup_list_o=`echo " $module_list_o " | sed 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g'`
++mibgroup_list_o=`echo " $module_list_o " | sed -e 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g' -e 's@ mibgroup/[^ ]*/\([^ /]*\).o@ mibgroup/\1.o@g'`
+ changequote([, ])
+ AC_SUBST(module_list_c)
+ AC_SUBST(module_list_h)
+@@ -1034,11 +1035,7 @@
  
-     esac
- else
--    SHLIB_EXTENSION="a"
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_dst, no)
+ 
+@@ -1049,11 +1046,7 @@
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ],[
+ 
+@@ -1070,11 +1063,7 @@
+ if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ],[
+ struct rtentry rt; 
+@@ -1124,11 +1113,7 @@
+ [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ],[
+ struct rtentry rt; 
+@@ -1145,41 +1130,25 @@
+ dnl Check struct rtentry for various things.
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_unit)
+ 
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_refcnt)
+ 
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_hash)
+ 
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_use)
+ 
+--- configure.orig	Fri Jan 21 07:52:16 2000
++++ configure	Fri Jan 21 08:05:01 2000
+@@ -1910,7 +1910,8 @@
+     else
+       SHLIB_CFLAGS="-Kpic"
+     fi
+-    SHLIB_EXTENSION="so"
++#   SHLIB_EXTENSION="so"
 +    SHLIB_EXTENSION="la"
-     SHLIB_LD_CMD="ar cr"
-     SHLIB_LDCONFIG_CMD=":"
-+    RANLIB=":"
+ 	SHLIB_VERSION=
+     SHLIB_LD_CMD="ld -r -o"
+     SHLIB_LDCONFIG_CMD=
+@@ -1993,7 +1994,7 @@
+ # 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:1997: checking for $ac_word" >&5
++echo "configure:1998: 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
+@@ -2021,7 +2022,7 @@
+ fi
+ 
+ echo $ac_n "checking for how to build the library""... $ac_c" 1>&6
+-echo "configure:2025: checking for how to build the library" >&5
++echo "configure:2026: checking for how to build the library" >&5
+ echo "$ac_t""EXTENISON=$SHLIB_EXTENSION, VERSION=$SHLIB_VERSION, LD=$SHLIB_LD_CMD, LDCONFIG=$SHLIB_LDCONFIG_CMD, RANLIB=$RANLIB, CCFLAGS=$SHLIB_CFLAGS $CC_RUNTIME_ARG" 1>&6
+ 
+ if test "x$enable_ipv6" = "xyes"; then
+@@ -2030,12 +2031,12 @@
+ 	v6trylibc=no
+ 
+ 	echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6
+-echo "configure:2034: checking ipv6 stack type" >&5
++echo "configure:2035: checking ipv6 stack type" >&5
+ 	for i in v6d toshiba kame inria zeta linux; do
+ 		case $i in
+ 		v6d)
+ 			cat > conftest.$ac_ext <<EOF
+-#line 2039 "configure"
++#line 2040 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/types.h>
+@@ -2055,7 +2056,7 @@
+ 			;;
+ 		toshiba)
+ 			cat > conftest.$ac_ext <<EOF
+-#line 2059 "configure"
++#line 2060 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+@@ -2075,7 +2076,7 @@
+ 			;;
+ 		kame)
+ 			cat > conftest.$ac_ext <<EOF
+-#line 2079 "configure"
++#line 2080 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+@@ -2096,7 +2097,7 @@
+ 			;;
+ 		inria)
+ 			cat > conftest.$ac_ext <<EOF
+-#line 2100 "configure"
++#line 2101 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+@@ -2114,7 +2115,7 @@
+ 			;;
+ 		zeta)
+ 			cat > conftest.$ac_ext <<EOF
+-#line 2118 "configure"
++#line 2119 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+@@ -2169,7 +2170,7 @@
+ 
+ 
+ echo $ac_n "checking for and configuring mib modules to use""... $ac_c" 1>&6
+-echo "configure:2173: checking for and configuring mib modules to use" >&5
++echo "configure:2174: checking for and configuring mib modules to use" >&5
+ 
+ mibdir="agent/mibgroup"
+ module_list=""
+@@ -2211,7 +2212,7 @@
+ echo "$ac_t""$new_module_list." 1>&6
+ 
+ echo $ac_n "checking for and configuring mib modules pieces to use""... $ac_c" 1>&6
+-echo "configure:2215: checking for and configuring mib modules pieces to use" >&5
++echo "configure:2216: checking for and configuring mib modules pieces to use" >&5
+ while test "x$new_module_list" != "x"; do
+   for i in $new_module_list
+     do
+@@ -2292,7 +2293,7 @@
+ done
+ module_list_o=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.o /g'`
+ module_list_c=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.c /g'`
+-mibgroup_list_o=`echo " $module_list_o " | sed 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g'`
++mibgroup_list_o=`echo " $module_list_o " | sed -e 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g' -e 's@ mibgroup/[^ ]*/\([^ /]*\).o@ mibgroup/\1.o@g'`
+ 
+ 
+ 
+@@ -2301,14 +2302,14 @@
+ 
+ echo "$ac_t""." 1>&6
+ echo $ac_n "checking if directories neeed to be created""... $ac_c" 1>&6
+-echo "configure:2305: checking if directories neeed to be created" >&5
++echo "configure:2306: checking if directories neeed to be created" >&5
+ for i in $module_directories; do
+   $srcdir/mkinstalldirs $i
+ done
+ echo "$ac_t""." 1>&6
+ 
+ echo $ac_n "checking default mib files to read""... $ac_c" 1>&6
+-echo "configure:2312: checking default mib files to read" >&5
++echo "configure:2313: checking default mib files to read" >&5
+ if test "x$DEFAULT_MIBS" = "x"; then
+   DEFAULT_MIBS="$default_mibs"
+ fi
+@@ -2320,7 +2321,7 @@
+ 
+ 
+ echo $ac_n "checking for location of system kernel""... $ac_c" 1>&6
+-echo "configure:2324: checking for location of system kernel" >&5
++echo "configure:2325: checking for location of system kernel" >&5
+ if eval "test \"`echo '$''{'ac_cv_KERNEL_LOC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2356,7 +2357,7 @@
+ 
+ 
+ echo $ac_n "checking for mount table location""... $ac_c" 1>&6
+-echo "configure:2360: checking for mount table location" >&5
++echo "configure:2361: checking for mount table location" >&5
+ if eval "test \"`echo '$''{'ac_cv_ETC_MNTTAB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2379,7 +2380,7 @@
+ 
+ 
+ echo $ac_n "checking for location of swap device""... $ac_c" 1>&6
+-echo "configure:2383: checking for location of swap device" >&5
++echo "configure:2384: checking for location of swap device" >&5
+ if eval "test \"`echo '$''{'ac_cv_DMEM_LOC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2413,7 +2414,7 @@
+ fi
+ 
+ echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
+-echo "configure:2417: checking for nlist in -lelf" >&5
++echo "configure:2418: checking for nlist in -lelf" >&5
+ ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2421,7 +2422,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lelf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2425 "configure"
++#line 2426 "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
+@@ -2432,7 +2433,7 @@
+ nlist()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2437: \"$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
+@@ -2460,7 +2461,7 @@
+ fi
+ 
+ echo $ac_n "checking for asin in -lm""... $ac_c" 1>&6
+-echo "configure:2464: checking for asin in -lm" >&5
++echo "configure:2465: checking for asin in -lm" >&5
+ ac_lib_var=`echo m'_'asin | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2468,7 +2469,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2472 "configure"
++#line 2473 "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
+@@ -2479,7 +2480,7 @@
+ asin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2484: \"$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
+@@ -2509,12 +2510,12 @@
+ for ac_func in gethostbyname getservbyname
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2513: checking for $ac_func" >&5
++echo "configure:2514: 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 2518 "configure"
++#line 2519 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2537,7 +2538,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2542: \"$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
+@@ -2563,7 +2564,7 @@
+ 
+ if test "x$ac_cv_func_gethostbyname" != "xyes"; then
+        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2567: checking for gethostbyname in -lnsl" >&5
++echo "configure:2568: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2571,7 +2572,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2575 "configure"
++#line 2576 "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
+@@ -2582,7 +2583,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2618,7 +2619,7 @@
+ fi
+ if test "x$ac_cv_func_getservbyname" != "xyes"; then
+        echo $ac_n "checking for getservbyname in -lsocket""... $ac_c" 1>&6
+-echo "configure:2622: checking for getservbyname in -lsocket" >&5
++echo "configure:2623: checking for getservbyname in -lsocket" >&5
+ ac_lib_var=`echo socket'_'getservbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2626,7 +2627,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2630 "configure"
++#line 2631 "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
+@@ -2637,7 +2638,7 @@
+ getservbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2642: \"$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
+@@ -2673,7 +2674,7 @@
+ fi
+ 
+ echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
+-echo "configure:2677: checking for zlibVersion in -lz" >&5
++echo "configure:2678: checking for zlibVersion in -lz" >&5
+ ac_lib_var=`echo z'_'zlibVersion | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2681,7 +2682,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2685 "configure"
++#line 2686 "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
+@@ -2692,7 +2693,7 @@
+ zlibVersion()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2697: \"$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
+@@ -2720,7 +2721,7 @@
+ fi
+ 
+ echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6
+-echo "configure:2724: checking for dbopen in -ldb1" >&5
++echo "configure:2725: checking for dbopen in -ldb1" >&5
+ ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2728,7 +2729,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb1 -lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2732 "configure"
++#line 2733 "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
+@@ -2739,7 +2740,7 @@
+ dbopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2744: \"$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
+@@ -2768,7 +2769,7 @@
+ 
+ if test "x$ac_cv_lib_db1_dbopen" = "xno"; then
+   echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:2772: checking for dbopen in -ldb" >&5
++echo "configure:2773: checking for dbopen in -ldb" >&5
+ ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2776,7 +2777,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldb -lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2780 "configure"
++#line 2781 "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
+@@ -2787,7 +2788,7 @@
+ dbopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2792: \"$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
+@@ -2816,7 +2817,7 @@
  fi
  
+ echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+-echo "configure:2820: checking for rpmdbOpen in -lrpm" >&5
++echo "configure:2821: checking for rpmdbOpen in -lrpm" >&5
+ ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2824,7 +2825,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lrpm -lz $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2828 "configure"
++#line 2829 "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
+@@ -2835,7 +2836,7 @@
+ rpmdbOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
+@@ -2864,7 +2865,7 @@
+ 
  
-@@ -4941,11 +4942,15 @@
+ echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6
+-echo "configure:2868: checking for kstat_lookup in -lkstat" >&5
++echo "configure:2869: checking for kstat_lookup in -lkstat" >&5
+ ac_lib_var=`echo kstat'_'kstat_lookup | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2872,7 +2873,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkstat  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2876 "configure"
++#line 2877 "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
+@@ -2883,7 +2884,7 @@
+ kstat_lookup()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2888: \"$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
+@@ -2911,7 +2912,7 @@
+ fi
+ 
+ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
+-echo "configure:2915: checking for kvm_read in -lkvm" >&5
++echo "configure:2916: checking for kvm_read in -lkvm" >&5
+ ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2919,7 +2920,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkvm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2923 "configure"
++#line 2924 "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
+@@ -2930,7 +2931,7 @@
+ kvm_read()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2935: \"$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
+@@ -2958,7 +2959,7 @@
+ fi
  
+ echo $ac_n "checking for nlist in -lmld""... $ac_c" 1>&6
+-echo "configure:2962: checking for nlist in -lmld" >&5
++echo "configure:2963: checking for nlist in -lmld" >&5
+ ac_lib_var=`echo mld'_'nlist | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2966,7 +2967,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2970 "configure"
++#line 2971 "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
+@@ -2977,7 +2978,7 @@
+ nlist()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2982: \"$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
+@@ -3005,7 +3006,7 @@
+ fi
+ 
+ echo $ac_n "checking for SSLeay_version in -lcrypto""... $ac_c" 1>&6
+-echo "configure:3009: checking for SSLeay_version in -lcrypto" >&5
++echo "configure:3010: checking for SSLeay_version in -lcrypto" >&5
+ ac_lib_var=`echo crypto'_'SSLeay_version | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3013,7 +3014,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypto  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3017 "configure"
++#line 3018 "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
+@@ -3024,7 +3025,7 @@
+ SSLeay_version()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3029: \"$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
+@@ -3052,7 +3053,7 @@
+ fi
+ 
+ echo $ac_n "checking for kmt_init in -lkmt""... $ac_c" 1>&6
+-echo "configure:3056: checking for kmt_init in -lkmt" >&5
++echo "configure:3057: checking for kmt_init in -lkmt" >&5
+ ac_lib_var=`echo kmt'_'kmt_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
+@@ -3060,7 +3061,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lkmt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3064 "configure"
++#line 3065 "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
+@@ -3071,7 +3072,7 @@
+ kmt_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3076: \"$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
+@@ -3100,12 +3101,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3104: checking for ANSI C header files" >&5
++echo "configure:3105: 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 3109 "configure"
++#line 3110 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3113,7 +3114,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3118: \"$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*
+@@ -3130,7 +3131,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 3134 "configure"
++#line 3135 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -3148,7 +3149,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 3152 "configure"
++#line 3153 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -3169,7 +3170,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3173 "configure"
++#line 3174 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -3180,7 +3181,7 @@
+ exit (0); }
  
+ EOF
+-if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3208,12 +3209,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:3212: checking for $ac_hdr that defines DIR" >&5
++echo "configure:3213: 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 3217 "configure"
++#line 3218 "configure"
+ #include "confdefs.h"
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+ #include <$ac_hdr>
+@@ -3221,7 +3222,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -3246,7 +3247,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:3250: checking for opendir in -ldir" >&5
++echo "configure:3251: 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
+@@ -3254,7 +3255,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3258 "configure"
++#line 3259 "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
+@@ -3265,7 +3266,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3270: \"$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
+@@ -3287,7 +3288,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:3291: checking for opendir in -lx" >&5
++echo "configure:3292: 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
+@@ -3295,7 +3296,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3299 "configure"
++#line 3300 "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
+@@ -3306,7 +3307,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3311: \"$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
+@@ -3329,12 +3330,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:3333: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:3334: 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 3338 "configure"
++#line 3339 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -3350,7 +3351,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -3374,17 +3375,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3378: checking for $ac_hdr" >&5
++echo "configure:3379: 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 3383 "configure"
++#line 3384 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3389: \"$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*
+@@ -3414,17 +3415,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3418: checking for $ac_hdr" >&5
++echo "configure:3419: 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 3423 "configure"
++#line 3424 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3429: \"$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*
+@@ -3454,17 +3455,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3458: checking for $ac_hdr" >&5
++echo "configure:3459: 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 3463 "configure"
++#line 3464 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3469: \"$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*
+@@ -3494,17 +3495,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3498: checking for $ac_hdr" >&5
++echo "configure:3499: 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 3503 "configure"
++#line 3504 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3509: \"$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*
+@@ -3534,17 +3535,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3538: checking for $ac_hdr" >&5
++echo "configure:3539: 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 3543 "configure"
++#line 3544 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3549: \"$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*
+@@ -3574,17 +3575,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3578: checking for $ac_hdr" >&5
++echo "configure:3579: 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 3583 "configure"
++#line 3584 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3589: \"$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*
+@@ -3614,17 +3615,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3618: checking for $ac_hdr" >&5
++echo "configure:3619: 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 3623 "configure"
++#line 3624 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3629: \"$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*
+@@ -3654,17 +3655,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3658: checking for $ac_hdr" >&5
++echo "configure:3659: 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 3663 "configure"
++#line 3664 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3669: \"$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*
+@@ -3694,17 +3695,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3698: checking for $ac_hdr" >&5
++echo "configure:3699: 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 3703 "configure"
++#line 3704 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3709: \"$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*
+@@ -3734,17 +3735,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3738: checking for $ac_hdr" >&5
++echo "configure:3739: 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 3743 "configure"
++#line 3744 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3749: \"$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*
+@@ -3774,17 +3775,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3778: checking for $ac_hdr" >&5
++echo "configure:3779: 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 3783 "configure"
++#line 3784 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3789: \"$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*
+@@ -3814,17 +3815,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3818: checking for $ac_hdr" >&5
++echo "configure:3819: 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 3823 "configure"
++#line 3824 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3829: \"$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*
+@@ -3854,17 +3855,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3858: checking for $ac_hdr" >&5
++echo "configure:3859: 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 3863 "configure"
++#line 3864 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3869: \"$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*
+@@ -3894,17 +3895,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3898: checking for $ac_hdr" >&5
++echo "configure:3899: 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 3903 "configure"
++#line 3904 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3909: \"$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*
+@@ -3935,17 +3936,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3939: checking for $ac_hdr" >&5
++echo "configure:3940: 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 3944 "configure"
++#line 3945 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3950: \"$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*
+@@ -3980,12 +3981,12 @@
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:3984: checking for off_t" >&5
++echo "configure:3985: 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 3989 "configure"
++#line 3990 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4013,12 +4014,12 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:4017: checking for pid_t" >&5
++echo "configure:4018: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4022 "configure"
++#line 4023 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4046,12 +4047,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:4050: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:4051: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4055 "configure"
++#line 4056 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -4060,7 +4061,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -4082,12 +4083,12 @@
+ 
+ 
+ echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
+-echo "configure:4086: checking for in_addr_t" >&5
++echo "configure:4087: checking for in_addr_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_$1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4091 "configure"
++#line 4092 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4119,7 +4120,7 @@
+ fi
+ 
+ echo $ac_n "checking for correct flags to ps""... $ac_c" 1>&6
+-echo "configure:4123: checking for correct flags to ps" >&5
++echo "configure:4124: checking for correct flags to ps" >&5
+ if eval "test \"`echo '$''{'ac_cv_ps_flags'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4148,14 +4149,14 @@
+ 
+ 
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:4152: checking whether byte ordering is bigendian" >&5
++echo "configure:4153: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 4159 "configure"
++#line 4160 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -4166,11 +4167,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 4174 "configure"
++#line 4175 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -4181,7 +4182,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_bigendian=yes
+ else
+@@ -4201,7 +4202,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4205 "configure"
++#line 4206 "configure"
+ #include "confdefs.h"
+ main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -4214,7 +4215,7 @@
+   exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_bigendian=no
+ else
+@@ -4241,19 +4242,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:4245: checking for working alloca.h" >&5
++echo "configure:4246: 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 4250 "configure"
++#line 4251 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4258: \"$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
+@@ -4274,12 +4275,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:4278: checking for alloca" >&5
++echo "configure:4279: 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 4283 "configure"
++#line 4284 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -4307,7 +4308,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4312: \"$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
+@@ -4339,12 +4340,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:4343: checking whether alloca needs Cray hooks" >&5
++echo "configure:4344: 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 4348 "configure"
++#line 4349 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -4369,12 +4370,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:4373: checking for $ac_func" >&5
++echo "configure:4374: 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 4378 "configure"
++#line 4379 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4397,7 +4398,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4402: \"$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
+@@ -4424,7 +4425,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:4428: checking stack direction for C alloca" >&5
++echo "configure:4429: 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
+@@ -4432,7 +4433,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4436 "configure"
++#line 4437 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -4451,7 +4452,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4456: \"$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
+@@ -4474,13 +4475,13 @@
+ 
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:4478: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:4479: checking whether ${CC-cc} needs -traditional" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat > conftest.$ac_ext <<EOF
+-#line 4484 "configure"
++#line 4485 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+@@ -4498,7 +4499,7 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 4502 "configure"
++#line 4503 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+@@ -4520,7 +4521,7 @@
+ fi
+ 
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:4524: checking for 8-bit clean memcmp" >&5
++echo "configure:4525: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4528,7 +4529,7 @@
+   ac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4532 "configure"
++#line 4533 "configure"
+ #include "confdefs.h"
+ 
+ main()
+@@ -4538,7 +4539,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_memcmp_clean=yes
+ else
+@@ -4556,12 +4557,12 @@
+ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:4560: checking return type of signal handlers" >&5
++echo "configure:4561: 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 4565 "configure"
++#line 4566 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4578,7 +4579,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -4598,7 +4599,7 @@
+ 
+ # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
+ echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6
+-echo "configure:4602: checking for getmntent in -lsun" >&5
++echo "configure:4603: checking for getmntent in -lsun" >&5
+ ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4606,7 +4607,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsun  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4610 "configure"
++#line 4611 "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
+@@ -4617,7 +4618,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4622: \"$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
+@@ -4636,7 +4637,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
+-echo "configure:4640: checking for getmntent in -lseq" >&5
++echo "configure:4641: checking for getmntent in -lseq" >&5
+ ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4644,7 +4645,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lseq  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4648 "configure"
++#line 4649 "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
+@@ -4655,7 +4656,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4660: \"$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
+@@ -4674,7 +4675,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
+-echo "configure:4678: checking for getmntent in -lgen" >&5
++echo "configure:4679: checking for getmntent in -lgen" >&5
+ ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4682,7 +4683,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgen  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4686 "configure"
++#line 4687 "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
+@@ -4693,7 +4694,7 @@
+ getmntent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4698: \"$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
+@@ -4718,12 +4719,12 @@
+ fi
+ 
+ echo $ac_n "checking for getmntent""... $ac_c" 1>&6
+-echo "configure:4722: checking for getmntent" >&5
++echo "configure:4723: checking for getmntent" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4727 "configure"
++#line 4728 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getmntent(); below.  */
+@@ -4746,7 +4747,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_getmntent=yes"
+ else
+@@ -4771,12 +4772,12 @@
+ for ac_func in setmntent gethostname uname gettimeofday select socket strtol
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4775: checking for $ac_func" >&5
++echo "configure:4776: 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 4780 "configure"
++#line 4781 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4799,7 +4800,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4804: \"$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
+@@ -4826,12 +4827,12 @@
+ for ac_func in strchr strdup memcpy memmove index bcopy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4830: checking for $ac_func" >&5
++echo "configure:4831: 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 4835 "configure"
++#line 4836 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4854,7 +4855,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4859: \"$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
+@@ -4881,12 +4882,12 @@
+ for ac_func in signal sigset sigblock sighold strerror setenv vsnprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4885: checking for $ac_func" >&5
++echo "configure:4886: 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 4890 "configure"
++#line 4891 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4909,7 +4910,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4913: \"$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${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4936,12 +4937,12 @@
+ for ac_func in random lrand48 rand
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4940: checking for $ac_func" >&5
++echo "configure:4941: 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 4945 "configure"
++#line 4946 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4964,7 +4965,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4969: \"$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
+@@ -4991,12 +4992,12 @@
+ for ac_func in rpmGetPath
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4995: checking for $ac_func" >&5
++echo "configure:4996: 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 5000 "configure"
++#line 5001 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5019,7 +5020,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5024: \"$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
+@@ -5047,12 +5048,12 @@
+ for ac_func in getloadavg
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5051: checking for $ac_func" >&5
++echo "configure:5052: 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 5056 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5075,7 +5076,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5080: \"$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
+@@ -5102,12 +5103,12 @@
+ for ac_func in kvm_openfiles nlist
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5106: checking for $ac_func" >&5
++echo "configure:5107: 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 5111 "configure"
++#line 5112 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5130,7 +5131,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5135: \"$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
+@@ -5157,12 +5158,12 @@
+ for ac_func in statvfs statfs
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5161: checking for $ac_func" >&5
++echo "configure:5162: 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 5166 "configure"
++#line 5167 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5185,7 +5186,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5190: \"$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
+@@ -5212,12 +5213,12 @@
+ for ac_func in getdtablesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5216: checking for $ac_func" >&5
++echo "configure:5217: 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 5221 "configure"
++#line 5222 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5240,7 +5241,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5244: \"$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${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5267,12 +5268,12 @@
+ for ac_func in getfsstat kvm_getprocs
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5271: checking for $ac_func" >&5
++echo "configure:5272: 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 5276 "configure"
++#line 5277 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5295,7 +5296,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5300: \"$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
+@@ -5322,12 +5323,12 @@
+ for ac_func in usleep
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5326: checking for $ac_func" >&5
++echo "configure:5327: 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 5331 "configure"
++#line 5332 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5350,7 +5351,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5355: \"$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
+@@ -5377,12 +5378,12 @@
+ for ac_func in setlocale
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5381: checking for $ac_func" >&5
++echo "configure:5382: 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 5386 "configure"
++#line 5387 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5405,7 +5406,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5410: \"$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
+@@ -5432,12 +5433,12 @@
+ for ac_func in tcgetattr
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5436: checking for $ac_func" >&5
++echo "configure:5437: 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 5441 "configure"
++#line 5442 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5460,7 +5461,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5465: \"$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
+@@ -5487,12 +5488,12 @@
+ for ac_func in if_nameindex if_freenameindex
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5491: checking for $ac_func" >&5
++echo "configure:5492: 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 5496 "configure"
++#line 5497 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5515,7 +5516,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5520: \"$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
+@@ -5541,12 +5542,12 @@
+ 
+ 
+ echo $ac_n "checking for SIOCGIFADDR in sys/ioctl.h""... $ac_c" 1>&6
+-echo "configure:5545: checking for SIOCGIFADDR in sys/ioctl.h" >&5
++echo "configure:5546: checking for SIOCGIFADDR in sys/ioctl.h" >&5
+ if eval "test \"`echo '$''{'cv_sys_ioctl_h_has_SIOCGIFADDR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+    cat > conftest.$ac_ext <<EOF
+-#line 5550 "configure"
++#line 5551 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_IOCTL_H
+@@ -5579,7 +5580,7 @@
+ 
+ # ultrix
+ echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
+-echo "configure:5583: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
++echo "configure:5584: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+ if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5587,7 +5588,7 @@
+   fu_cv_sys_stat_fs_data=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5591 "configure"
++#line 5592 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+@@ -5607,7 +5608,7 @@
+ exit (statfs (".", &fsd) != 1);
+ }
+ EOF
+-if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_fs_data=yes
+ else
+@@ -5630,13 +5631,13 @@
+ fi
+ 
+ echo $ac_n "checking if __FUNCTION__ is defined""... $ac_c" 1>&6
+-echo "configure:5634: checking if __FUNCTION__ is defined" >&5
++echo "configure:5635: checking if __FUNCTION__ is defined" >&5
+ if eval "test \"`echo '$''{'ac_cv_HAVE_CPP_UNDERBAR_FUNCTION_DEFINED'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 5640 "configure"
++#line 5641 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -5645,7 +5646,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_HAVE_CPP_UNDERBAR_FUNCTION_DEFINED=yes
+ else
+@@ -5674,7 +5675,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for rtentry.rt_dst""... $ac_c" 1>&6
+-echo "configure:5678: checking for rtentry.rt_dst" >&5
++echo "configure:5679: checking for rtentry.rt_dst" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5687,16 +5688,12 @@
+   defineit="no"
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 5691 "configure"
++#line 5692 "configure"
+ #include "confdefs.h"
+ 
+ 
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  
-@@ -4994,11 +4999,15 @@
+@@ -5707,7 +5704,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -5734,22 +5731,18 @@
+ 
+ 
+ echo $ac_n "checking type of rtentry structure""... $ac_c" 1>&6
+-echo "configure:5738: checking type of rtentry structure" >&5
++echo "configure:5735: checking type of rtentry structure" >&5
+ if eval "test \"`echo '$''{'ac_cv_RTENTRY_TYPE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 5745 "configure"
++#line 5742 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  int main() {
-@@ -5029,11 +5038,15 @@
+@@ -5765,7 +5758,7 @@
+   
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_RTENTRY_TYPE="BSD-4.4"
+ else
+@@ -5776,15 +5769,11 @@
+ 
+ if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
+ cat > conftest.$ac_ext <<EOF
+-#line 5780 "configure"
++#line 5773 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  int main() {
-@@ -5079,7 +5092,9 @@
+@@ -5794,7 +5783,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_RTENTRY_TYPE="BSD-4.3"
+ else
+@@ -5823,12 +5812,12 @@
+ 
+ if test "x$ac_cv_RTENTRY_TYPE" = "xunknown"; then
+ echo $ac_n "checking for struct rtentry""... $ac_c" 1>&6
+-echo "configure:5827: checking for struct rtentry" >&5
++echo "configure:5816: checking for struct rtentry" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_rtentry'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
    cat > conftest.$ac_ext <<EOF
- #line 5081 "configure"
+-#line 5832 "configure"
++#line 5821 "configure"
  #include "confdefs.h"
-+#if 0
  #define KERNEL
-+#endif
  #include<net/route.h>
+@@ -5872,21 +5861,17 @@
  
- EOF
-@@ -5131,11 +5146,15 @@
+ if test "x$ac_cv_RTENTRY_TYPE" = "xBSD-4.3"; then
+ echo $ac_n "checking for struct rtentry has a rt_next node""... $ac_c" 1>&6
+-echo "configure:5876: checking for struct rtentry has a rt_next node" >&5
++echo "configure:5865: checking for struct rtentry has a rt_next node" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_rtentry_rt_next'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 5882 "configure"
++#line 5871 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  int main() {
-@@ -5195,11 +5214,15 @@
+@@ -5896,7 +5881,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_rtentry_rt_next=yes
+ else
+@@ -5928,7 +5913,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for rtentry.rt_unit""... $ac_c" 1>&6
+-echo "configure:5932: checking for rtentry.rt_unit" >&5
++echo "configure:5917: checking for rtentry.rt_unit" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5941,16 +5926,12 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 5945 "configure"
++#line 5930 "configure"
+ #include "confdefs.h"
  
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  
-@@ -5262,11 +5285,15 @@
+@@ -5961,7 +5942,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -5995,7 +5976,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for rtentry.rt_refcnt""... $ac_c" 1>&6
+-echo "configure:5999: checking for rtentry.rt_refcnt" >&5
++echo "configure:5980: checking for rtentry.rt_refcnt" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6008,16 +5989,12 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6012 "configure"
++#line 5993 "configure"
+ #include "confdefs.h"
  
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  
-@@ -5329,11 +5356,15 @@
+@@ -6028,7 +6005,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6062,7 +6039,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for rtentry.rt_hash""... $ac_c" 1>&6
+-echo "configure:6066: checking for rtentry.rt_hash" >&5
++echo "configure:6043: checking for rtentry.rt_hash" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6075,16 +6052,12 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6079 "configure"
++#line 6056 "configure"
+ #include "confdefs.h"
  
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  
-@@ -5396,11 +5427,15 @@
+@@ -6095,7 +6068,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6129,7 +6102,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for rtentry.rt_use""... $ac_c" 1>&6
+-echo "configure:6133: checking for rtentry.rt_use" >&5
++echo "configure:6106: checking for rtentry.rt_use" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6142,16 +6115,12 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6146 "configure"
++#line 6119 "configure"
+ #include "confdefs.h"
  
  
  #include <sys/types.h>
-+#if 0
- #define KERNEL
- #define _KERNEL
-+#endif
+-#define KERNEL
+-#define _KERNEL
  #include <sys/socket.h>
-+#if 0
- #undef KERNEL
- #undef _KERNEL
-+#endif
+-#undef KERNEL
+-#undef _KERNEL
  #include <net/route.h>
  
  
-@@ -7699,6 +7734,7 @@
-   fi
+@@ -6162,7 +6131,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6196,7 +6165,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for tcpstat.tcp_rcvmemdrop""... $ac_c" 1>&6
+-echo "configure:6200: checking for tcpstat.tcp_rcvmemdrop" >&5
++echo "configure:6169: checking for tcpstat.tcp_rcvmemdrop" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6209,7 +6178,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6213 "configure"
++#line 6182 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6231,7 +6200,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6266,7 +6235,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_mtu""... $ac_c" 1>&6
+-echo "configure:6270: checking for ifnet.if_mtu" >&5
++echo "configure:6239: checking for ifnet.if_mtu" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6279,7 +6248,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6283 "configure"
++#line 6252 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6298,7 +6267,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6326,7 +6295,7 @@
+ 
+ if test "x$ac_cv_struct_ifnet_has_if_mtu" = "xno"; then
+ echo $ac_n "checking if _KERNEL needs to be defined for if_mtu""... $ac_c" 1>&6
+-echo "configure:6330: checking if _KERNEL needs to be defined for if_mtu" >&5
++echo "configure:6299: checking if _KERNEL needs to be defined for if_mtu" >&5
+ if eval "test \"`echo '$''{'ac_cv_IFNET_NEEDS_KERNEL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6335,7 +6304,7 @@
+   ac_cv_IFNET_NEEDS_KERNEL=no
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 6339 "configure"
++#line 6308 "configure"
+ #include "confdefs.h"
+ 
+ #define _KERNEL 1
+@@ -6356,7 +6325,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_IFNET_NEEDS_KERNEL=yes
+ else
+@@ -6388,7 +6357,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifaddr.ifa_next""... $ac_c" 1>&6
+-echo "configure:6392: checking for ifaddr.ifa_next" >&5
++echo "configure:6361: checking for ifaddr.ifa_next" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6401,7 +6370,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6405 "configure"
++#line 6374 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6426,7 +6395,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6461,7 +6430,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_baudrate""... $ac_c" 1>&6
+-echo "configure:6465: checking for ifnet.if_baudrate" >&5
++echo "configure:6434: checking for ifnet.if_baudrate" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6474,7 +6443,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6478 "configure"
++#line 6447 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6533,7 +6502,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6568,7 +6537,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_speed""... $ac_c" 1>&6
+-echo "configure:6572: checking for ifnet.if_speed" >&5
++echo "configure:6541: checking for ifnet.if_speed" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6581,7 +6550,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6585 "configure"
++#line 6554 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6640,7 +6609,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6675,7 +6644,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_type""... $ac_c" 1>&6
+-echo "configure:6679: checking for ifnet.if_type" >&5
++echo "configure:6648: checking for ifnet.if_type" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6688,7 +6657,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6692 "configure"
++#line 6661 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6747,7 +6716,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6782,7 +6751,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_imcasts""... $ac_c" 1>&6
+-echo "configure:6786: checking for ifnet.if_imcasts" >&5
++echo "configure:6755: checking for ifnet.if_imcasts" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6795,7 +6764,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6799 "configure"
++#line 6768 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6854,7 +6823,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6889,7 +6858,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_iqdrops""... $ac_c" 1>&6
+-echo "configure:6893: checking for ifnet.if_iqdrops" >&5
++echo "configure:6862: checking for ifnet.if_iqdrops" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6902,7 +6871,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 6906 "configure"
++#line 6875 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -6961,7 +6930,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -6996,7 +6965,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_noproto""... $ac_c" 1>&6
+-echo "configure:7000: checking for ifnet.if_noproto" >&5
++echo "configure:6969: checking for ifnet.if_noproto" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7009,7 +6978,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7013 "configure"
++#line 6982 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7068,7 +7037,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7103,7 +7072,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_omcasts""... $ac_c" 1>&6
+-echo "configure:7107: checking for ifnet.if_omcasts" >&5
++echo "configure:7076: checking for ifnet.if_omcasts" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7116,7 +7085,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7120 "configure"
++#line 7089 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7175,7 +7144,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7210,7 +7179,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_xname""... $ac_c" 1>&6
+-echo "configure:7214: checking for ifnet.if_xname" >&5
++echo "configure:7183: checking for ifnet.if_xname" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7223,7 +7192,7 @@
+   defineit="no"
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7227 "configure"
++#line 7196 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7282,7 +7251,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7317,7 +7286,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_lastchange.tv_sec""... $ac_c" 1>&6
+-echo "configure:7321: checking for ifnet.if_lastchange.tv_sec" >&5
++echo "configure:7290: checking for ifnet.if_lastchange.tv_sec" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7330,7 +7299,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7334 "configure"
++#line 7303 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7389,7 +7358,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7424,7 +7393,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_obytes""... $ac_c" 1>&6
+-echo "configure:7428: checking for ifnet.if_obytes" >&5
++echo "configure:7397: checking for ifnet.if_obytes" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7437,7 +7406,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7441 "configure"
++#line 7410 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7496,7 +7465,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7531,7 +7500,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_ibytes""... $ac_c" 1>&6
+-echo "configure:7535: checking for ifnet.if_ibytes" >&5
++echo "configure:7504: checking for ifnet.if_ibytes" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7544,7 +7513,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7548 "configure"
++#line 7517 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7603,7 +7572,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7638,7 +7607,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_addrlist""... $ac_c" 1>&6
+-echo "configure:7642: checking for ifnet.if_addrlist" >&5
++echo "configure:7611: checking for ifnet.if_addrlist" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7651,7 +7620,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7655 "configure"
++#line 7624 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7710,7 +7679,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7745,7 +7714,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for ifnet.if_addrhead.tqh_first""... $ac_c" 1>&6
+-echo "configure:7749: checking for ifnet.if_addrhead.tqh_first" >&5
++echo "configure:7718: checking for ifnet.if_addrhead.tqh_first" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7758,7 +7727,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7762 "configure"
++#line 7731 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7817,7 +7786,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7852,7 +7821,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for udpstat.udps_discard""... $ac_c" 1>&6
+-echo "configure:7856: checking for udpstat.udps_discard" >&5
++echo "configure:7825: checking for udpstat.udps_discard" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7865,7 +7834,7 @@
+   defineit=""
  fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7869 "configure"
++#line 7838 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7881,7 +7850,7 @@
  
-+LIBS="$LIBS $LIBWRAP"
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7915,7 +7884,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for arphd.at_next""... $ac_c" 1>&6
+-echo "configure:7919: checking for arphd.at_next" >&5
++echo "configure:7888: checking for arphd.at_next" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7928,7 +7897,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 7932 "configure"
++#line 7901 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -7953,7 +7922,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -7987,7 +7956,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for swdevt.sw_nblksenabled""... $ac_c" 1>&6
+-echo "configure:7991: checking for swdevt.sw_nblksenabled" >&5
++echo "configure:7960: checking for swdevt.sw_nblksenabled" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8000,7 +7969,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8004 "configure"
++#line 7973 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -8016,7 +7985,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -8050,7 +8019,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ 
+ echo $ac_n "checking for statvfs.f_frsize""... $ac_c" 1>&6
+-echo "configure:8054: checking for statvfs.f_frsize" >&5
++echo "configure:8023: checking for statvfs.f_frsize" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8063,7 +8032,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8067 "configure"
++#line 8036 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -8085,7 +8054,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -8119,7 +8088,7 @@
+   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
  
- trap '' 1 2 15
- cat > confcache <<\EOF
+ echo $ac_n "checking for nlist.n_value""... $ac_c" 1>&6
+-echo "configure:8123: checking for nlist.n_value" >&5
++echo "configure:8092: checking for nlist.n_value" >&5
+ if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8132,7 +8101,7 @@
+   defineit=""
+ fi
+ cat > conftest.$ac_ext <<EOF
+-#line 8136 "configure"
++#line 8105 "configure"
+ #include "confdefs.h"
+ 
+ 
+@@ -8148,7 +8117,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "${ac_safe_all}=yes"
+ else
+@@ -8176,7 +8145,7 @@
+ 
+ 
+ echo $ac_n "checking if sysctl can read kernel information""... $ac_c" 1>&6
+-echo "configure:8180: checking if sysctl can read kernel information" >&5
++echo "configure:8149: checking if sysctl can read kernel information" >&5
+ if eval "test \"`echo '$''{'ac_cv_CAN_USE_SYSCTL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8184,7 +8153,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8188 "configure"
++#line 8157 "configure"
+ #include "confdefs.h"
+ 
+ #if TIME_WITH_SYS_TIME
+@@ -8222,7 +8191,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_CAN_USE_SYSCTL=yes
+ else
+@@ -8246,12 +8215,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
+-echo "configure:8250: checking for u_int8_t" >&5
++echo "configure:8219: checking for u_int8_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int8_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8255 "configure"
++#line 8224 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8279,12 +8248,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
+-echo "configure:8283: checking for u_int16_t" >&5
++echo "configure:8252: checking for u_int16_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8288 "configure"
++#line 8257 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8312,12 +8281,12 @@
+ fi
+ 
+ echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
+-echo "configure:8316: checking for u_int32_t" >&5
++echo "configure:8285: checking for u_int32_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8321 "configure"
++#line 8290 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8348,7 +8317,7 @@
+ 
+ if test "x$ac_cv_user_prompt_LOGFILE" = "x" -o "x$ac_cv_user_prompt_SYS_LOC" = "x" -o "x$ac_cv_user_prompt_SYS_CONTACT" = "x"; then
+ echo $ac_n "checking if you have run configure before""... $ac_c" 1>&6
+-echo "configure:8352: checking if you have run configure before" >&5
++echo "configure:8321: checking if you have run configure before" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_warned'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8403,7 +8372,7 @@
+ 
+ System Contact Information" | tail -1`
+ echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
+-echo "configure:8407: checking $MSG_CHECK" >&5
++echo "configure:8376: checking $MSG_CHECK" >&5
+ if eval "test \"`echo '$''{'ac_cv_user_prompt_SYS_CONTACT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8463,7 +8432,7 @@
+ 
+ System Location" | tail -1`
+ echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
+-echo "configure:8467: checking $MSG_CHECK" >&5
++echo "configure:8436: checking $MSG_CHECK" >&5
+ if eval "test \"`echo '$''{'ac_cv_user_prompt_SYS_LOC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8529,7 +8498,7 @@
+ 
+ Location to write logfile" | tail -1`
+ echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
+-echo "configure:8533: checking $MSG_CHECK" >&5
++echo "configure:8502: checking $MSG_CHECK" >&5
+ if eval "test \"`echo '$''{'ac_cv_user_prompt_LOGFILE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8594,7 +8563,7 @@
+ 
+ Location to write persistent information" | tail -1`
+ echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
+-echo "configure:8598: checking $MSG_CHECK" >&5
++echo "configure:8567: checking $MSG_CHECK" >&5
+ if eval "test \"`echo '$''{'ac_cv_user_prompt_PERSISTENT_DIRECTORY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-ab
index 526c3c53ac1..906d5880f12 100644
--- a/net/ucd-snmp/patches/patch-ab
+++ b/net/ucd-snmp/patches/patch-ab
@@ -1,30 +1,27 @@
-$NetBSD: patch-ab,v 1.3 1999/08/15 09:44:01 tron Exp $
-
---- snmplib/Makefile.in.orig	Mon Mar 15 17:49:10 1999
-+++ snmplib/Makefile.in	Sun Aug 15 11:17:50 1999
-@@ -7,12 +7,14 @@
- 	snmp_auth.c asn1.c md5.c \
- 	party.c context.c acl.c view.c \
- 	party_parse.c context_parse.c acl_parse.c \
--	system.c vacm.c int64.c read_config.c snmp_debug.c
-+	system.c vacm.c int64.c read_config.c snmp_debug.c \
+$NetBSD: patch-ab,v 1.4 2000/01/23 10:41:10 itojun Exp $
+--- snmplib/Makefile.in-	Fri Jan 21 05:38:31 2000
++++ snmplib/Makefile.in	Fri Jan 21 05:39:59 2000
+@@ -42,30 +42,34 @@
+ 	system.c vacm.c int64.c read_config.c 			\
+ 	snmp_debug.c tools.c  snmp_logging.c			\
+ 	snmpv3.c snmpusm.c lcd_time.c keytools.c		\
+-	scapi.c callback.c default_store.c snmp_alarm.c	
++	scapi.c callback.c default_store.c snmp_alarm.c	\
 +	libwrap.c
- OBJS=	snmp_client.o mib.o parse.o snmp_api.o snmp.o \
- 	snmp_auth.o asn1.o md5.o \
- 	party.o context.o acl.o view.o \
- 	party_parse.o context_parse.o acl_parse.o \
--	system.o vacm.o int64.o read_config.o snmp_debug.o
-+	system.o vacm.o int64.o read_config.o snmp_debug.o \
-+	libwrap.o
  
- #all but md5.h, vacm.h, libsnmp.h, and read_config.h are copied to the installed
- #include directory
-@@ -35,19 +37,18 @@
+ OBJS=	snmp_client.o mib.o parse.o snmp_api.o snmp.o 		\
+ 	snmp_auth.o asn1.o md5.o 				\
+ 	system.o vacm.o int64.o read_config.o 			\
+ 	snmp_debug.o tools.o  snmp_logging.o			\
+ 	snmpv3.o snmpusm.o lcd_time.o keytools.o		\
+-	scapi.o callback.o default_store.o snmp_alarm.o	
++	scapi.o callback.o default_store.o snmp_alarm.o	\
++	libwrap.c
  
- CFLAGS=@CFLAGS@ @SHLIB_CFLAGS@
- CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/..
--CC = @CC@ $(CPPFLAGS)
-+CC = $(LIBTOOL) @CC@ $(CPPFLAGS)
+ CFLAGS	 = @CFLAGS@ @SHLIB_CFLAGS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@
+-CC	 = @CC@ $(CPPFLAGS)
++CC	 = $(LIBTOOL) @CC@ $(CPPFLAGS)
  
  all: $(TARG)
  
@@ -33,6 +30,9 @@ $NetBSD: patch-ab,v 1.3 1999/08/15 09:44:01 tron Exp $
 -	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 +$(TARG): $(OBJS)
 +	$(CC) -o $@ $(OBJS:.o=.lo) -version-info 0:0 -rpath $(PREFIX)/lib
++#libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${OBJS}
++#	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
++#	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
  
  installdirs:
  	@$(SHELL) $(srcdir)/../mkinstalldirs $(libdir) $(includedir)
diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac
index 664c7e3453a..97b8cfac038 100644
--- a/net/ucd-snmp/patches/patch-ac
+++ b/net/ucd-snmp/patches/patch-ac
@@ -1,51 +1,55 @@
-$NetBSD: patch-ac,v 1.1 1999/08/15 09:44:01 tron Exp $
-
---- agent/Makefile.in.orig	Tue Mar 16 01:24:39 1999
-+++ agent/Makefile.in	Sun Aug 15 11:32:24 1999
-@@ -3,8 +3,8 @@
+--- agent/Makefile.in.orig	Fri Aug 13 07:16:28 1999
++++ agent/Makefile.in	Fri Jan 21 08:53:53 2000
+@@ -3,9 +3,11 @@
  #
  
- TARG=	 snmpd
--USELIBS= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
--LIBS=	 -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
+ TARG		= snmpd
+-USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+-LOCAL_LIBS	= -L../snmplib
+-LIBS		= $(CC_RUNTIME_ARG) -lsnmp @WRAPLIBS@ @LIBS@
++#USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 +USELIBS= ../snmplib/libsnmp.la
-+LIBS=	 ${USELIBS} @LIBS@
++#LOCAL_LIBS	= -L../snmplib
++#LIBS		= $(CC_RUNTIME_ARG) -lsnmp @WRAPLIBS@ @LIBS@
++LIBS=	 ${USELIBS} @WRAPLIBS@ @LIBS@
  
- CPPFLAGS=@CPPFLAGS@ -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib \
- 	-I$(srcdir) -I. -I$(srcdir)/mibgroup -Imibgroup
-@@ -20,21 +20,21 @@
+ CPPFLAGS	= -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib		\
+ 		  -I$(srcdir) -I. -I$(srcdir)/mibgroup -Imibgroup @CPPFLAGS@
+@@ -24,23 +26,23 @@
  #	cd dlmods; $(MAKE); cd ..
  
  getkstat: getkstat.o
--	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
-+	${LIBTOOL} $(CC) $(CFLAGS) -o $@ $? $(LIBS)
+-	$(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
++	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
  
  getkstat.o: mibgroup/kernel_sunos5.c
 -	$(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
-+	${LIBTOOL} $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
++	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
  
  getmibstat: getmibstat.o
--	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
-+	${LIBTOOL} $(CC) $(CFLAGS) -o $@ $? $(LIBS)
+-	$(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
++	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
  
  getmibstat.o: mibgroup/kernel_sunos5.c
 -	$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
-+	${LIBTOOL} $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
++	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
+ 
+ 
+ AGENTOBJS=snmpd.o kernel.o snmp_agent.o snmp_vars.o agent_read_config.o agent_registry.o auto_nlist.o
  
- AGENTOBJS=snmpd.o snmp2p.o kernel.o snmp_agent.o snmp_vars.o view_parse.o agent_read_config.o auto_nlist.o
  
  snmpd:	${MIBOBJS} ${AGENTOBJS} $(USELIBS)
--	${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} ${LDFLAGS} ${LIBS}  
-+	${LIBTOOL} ${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} ${LDFLAGS} ${LIBS}  
+-	${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}  
++	$(LIBTOOL) ${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}  
+ 
  
  clean:
- 	rm -f *.o ${TARG}
-@@ -42,7 +42,7 @@
- 	cd mibgroup; make clean
+@@ -50,7 +52,7 @@
+ 
  
  install:  installdirs
 -	@$(INSTALL) $(TARG) $(sbindir) ; echo "install:  installed $(TARG) in $(sbindir) "
-+	@${LIBTOOL} $(INSTALL) $(TARG) $(sbindir) ; echo "install:  installed $(TARG) in $(sbindir) "
++	@$(LIBTOOL) $(INSTALL) $(TARG) $(sbindir) ; echo "install:  installed $(TARG) in $(sbindir) "
  #	cd dlmods ; $(MAKE) install; cd ..
  
  installdirs:
diff --git a/net/ucd-snmp/patches/patch-ad b/net/ucd-snmp/patches/patch-ad
index 235faa988c8..f2e8b9e39b1 100644
--- a/net/ucd-snmp/patches/patch-ad
+++ b/net/ucd-snmp/patches/patch-ad
@@ -1,72 +1,83 @@
-$NetBSD: patch-ad,v 1.2 1999/08/15 10:12:52 tron Exp $
-
---- apps/Makefile.in.orig	Sat Mar  6 02:25:43 1999
-+++ apps/Makefile.in	Sun Aug 15 12:04:30 1999
-@@ -8,8 +8,8 @@
- SUBDIRS=  snmpnetstat
- TRAPSPECIAL=@trap_list_o@
- 
--USELIBS= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
--LIBS=	 -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
+$NetBSD: patch-ad,v 1.3 2000/01/23 10:41:10 itojun Exp $
+--- apps/Makefile.in.orig	Fri Aug 13 07:16:43 1999
++++ apps/Makefile.in	Fri Jan 21 07:49:48 2000
+@@ -12,9 +12,11 @@
+ SBINTARG	= snmptrapd
+ SUBDIRS		= snmpnetstat
+ 
+-USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+-LOCAL_LIBS	= -L../snmplib 
+-LIBS		= $(CC_RUNTIME_ARG) -lsnmp @LIBS@
++#USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 +USELIBS= ../snmplib/libsnmp.la
++#LOCAL_LIBS	= -L../snmplib 
++#LIBS		= $(CC_RUNTIME_ARG) -lsnmp @LIBS@
 +LIBS=	 ${USELIBS} @LIBS@
  
- PARSEOBJS=snmp_parse_args.o
+ PARSEOBJS	= snmp_parse_args.o
  
-@@ -24,40 +24,40 @@
+@@ -31,46 +33,46 @@
  	done
  
  snmpwalk:    snmpwalk.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpbulkwalk:    snmpbulkwalk.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptranslate:    snmptranslate.o $(USELIBS)
--	${CC} -o $@ snmptranslate.o ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptranslate.o ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpstatus:    snmpstatus.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpstatus.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpstatus.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpget:    snmpget.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpget.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpget.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpdelta:    snmpdelta.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpdelta.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpdelta.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptable:    snmptable.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmptable.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptable.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptest:    snmptest.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmptest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptrapd:    snmptrapd.o snmptrapd_handlers.o $(USELIBS)
--	${CC} -o $@ snmptrapd.o snmptrapd_handlers.o ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
- snmptrap:    snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptrap.o $(TRAPSPECIAL) $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+ snmptrap:    snmptrap.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpset:    snmpset.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpset.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpset.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
+ 
+ snmpusm:    snmpusm.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpgetnext:    snmpgetnext.o $(PARSEOBJS) $(USELIBS)
--	${CC} -o $@ snmpgetnext.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
+-	${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
+ 
+ encode_keychange:    encode_keychange.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	${LIBTOOL} ${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
+ 
  
  clean:
- 	rm -f *.o $(TARG) $(SBINTARG)
-@@ -69,8 +69,8 @@
+@@ -84,8 +86,8 @@
  	for i in $(SUBDIRS) ; do \
          ( cd $$i ; $(MAKE) install ) ; \
  	done
diff --git a/net/ucd-snmp/patches/patch-ae b/net/ucd-snmp/patches/patch-ae
index 9714ac310ee..62d217ced56 100644
--- a/net/ucd-snmp/patches/patch-ae
+++ b/net/ucd-snmp/patches/patch-ae
@@ -1,25 +1,26 @@
-$NetBSD: patch-ae,v 1.1 1999/08/15 09:44:01 tron Exp $
-
---- apps/snmpnetstat/Makefile.in.orig	Sat Mar  6 02:25:46 1999
-+++ apps/snmpnetstat/Makefile.in	Sun Aug 15 11:31:31 1999
-@@ -23,13 +23,13 @@
- CPPFLAGS=@CPPFLAGS@ -I../.. -I$(srcdir)/../.. -I$(srcdir)/../../snmplib
+$NetBSD: patch-ae,v 1.2 2000/01/23 10:41:10 itojun Exp $
+--- apps/snmpnetstat/Makefile.in.orig	Fri Jan 21 05:33:13 2000
++++ apps/snmpnetstat/Makefile.in	Fri Jan 21 05:46:14 2000
+@@ -23,13 +23,15 @@
+ CPPFLAGS=-I../.. -I$(srcdir)/../.. -I$(srcdir)/../../snmplib @CPPFLAGS@
  CC = @CC@ $(CPPFLAGS)
  
 -USELIBS=../../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 -LIBS=	 -L../../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
++#USELIBS=../../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
++#LIBS=	 -L../../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
 +USELIBS=../../snmplib/libsnmp.la
 +LIBS=	 ${USELIBS} @LIBS@
  
  all: $(TARG)
  
  snmpnetstat: ${OBJS} ${USELIBS}
--	${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS}
-+	${LIBTOOL} ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} ${LIBS}
+-	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}
++	${LIBTOOL} ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}
  
  distclean: clean
  
-@@ -49,7 +49,7 @@
+@@ -49,7 +51,7 @@
  	@$(SHELL) $(srcdir)/../../mkinstalldirs $(snmplibdir) $(bindir)
  
  install: installdirs $(TARG)
diff --git a/net/ucd-snmp/patches/patch-af b/net/ucd-snmp/patches/patch-af
index e09f76d18e8..fe3723a6d2c 100644
--- a/net/ucd-snmp/patches/patch-af
+++ b/net/ucd-snmp/patches/patch-af
@@ -1,17 +1,16 @@
-$NetBSD: patch-af,v 1.1 1999/08/15 11:07:14 tron Exp $
-
---- agent/mibgroup/mibII/interfaces.c.orig	Tue Mar 16 00:46:12 1999
-+++ agent/mibgroup/mibII/interfaces.c	Thu Jun 17 10:21:06 1999
-@@ -114,7 +114,7 @@
- 
- #if HAVE_SYS_SYSCTL_H
- #include <sys/sysctl.h>
+$NetBSD: patch-af,v 1.2 2000/01/23 10:41:10 itojun Exp $
+--- agent/mibgroup/mibII/interfaces.c.orig	Fri Jan 21 05:33:12 2000
++++ agent/mibgroup/mibII/interfaces.c	Fri Jan 21 05:46:58 2000
+@@ -121,7 +121,7 @@
+ #if defined(freebsd3)
+ #    define USE_SYSCTL_IFLIST
+ #else
 -# if defined(CTL_NET) && !defined(freebsd2)
 +# if defined(CTL_NET) && !defined(freebsd2) && !defined(netbsd1)
  #  ifdef PF_ROUTE
  #   ifdef NET_RT_IFLIST
  #    define USE_SYSCTL_IFLIST
-@@ -1462,16 +1462,31 @@
+@@ -1549,16 +1549,31 @@
  	    cp = strchr(saveName, '\0');
  	    string_append_int (cp, ifnet.if_unit);
  #endif
diff --git a/net/ucd-snmp/patches/patch-ag b/net/ucd-snmp/patches/patch-ag
index 3eb94bc7675..192c800f4cf 100644
--- a/net/ucd-snmp/patches/patch-ag
+++ b/net/ucd-snmp/patches/patch-ag
@@ -1,9 +1,7 @@
-$NetBSD: patch-ag,v 1.1 1999/08/15 11:07:14 tron Exp $
-
-
---- agent/mibgroup/mibII/ip.c.orig	Fri Mar 12 18:15:05 1999
-+++ agent/mibgroup/mibII/ip.c	Thu Jun 17 10:08:11 1999
-@@ -728,7 +728,11 @@
+$NetBSD: patch-ag,v 1.2 2000/01/23 10:41:10 itojun Exp $
+--- agent/mibgroup/mibII/ip.c.orig	Tue Aug 24 14:17:30 1999
++++ agent/mibgroup/mibII/ip.c	Fri Jan 21 05:48:22 2000
+@@ -761,7 +761,11 @@
  #ifdef linux
              return (u_char *)&((struct sockaddr_in *)&lowin_ifnet.ia_subnetmask)->sin_addr.s_addr;
  #else
@@ -15,14 +13,14 @@ $NetBSD: patch-ag,v 1.1 1999/08/15 11:07:14 tron Exp $
  	    return(u_char *) &long_return;
  #endif
  #endif
-@@ -737,7 +741,11 @@
+@@ -770,7 +774,11 @@
  #if defined(linux) || defined(sunV3)
  	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifnet.ifu_broadaddr)->sin_addr.s_addr) & 1;
  #else
 +#ifdef netbsd1
-+          long_return = (((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
++	    long_return = (((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
 +#else
-           long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
+ 	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
 +#endif
  #endif
  	    return(u_char *) &long_return;	   
diff --git a/net/ucd-snmp/patches/patch-ah b/net/ucd-snmp/patches/patch-ah
new file mode 100644
index 00000000000..1d974445fb1
--- /dev/null
+++ b/net/ucd-snmp/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2000/01/23 10:41:10 itojun Exp $
+--- agent/mibgroup/Makefile.in-	Fri Jan 21 05:58:34 2000
++++ agent/mibgroup/Makefile.in	Fri Jan 21 05:58:15 2000
+@@ -7,7 +7,7 @@
+ # object files in the sub directory.
+ 
+ .c.o:
+-	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++	$(LIBTOOL) $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+ 
+ OBJS = @module_list_o@
+ SRCS = @module_list_c@
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
index ce0f7ed279a..52915f6e938 100644
--- a/net/ucd-snmp/pkg/PLIST
+++ b/net/ucd-snmp/pkg/PLIST
@@ -1,27 +1,29 @@
-@comment $NetBSD: PLIST,v 1.5 1999/05/04 03:51:57 tv Exp $
-bin/snmpnetstat
-bin/snmpwalk
+@comment $NetBSD: PLIST,v 1.6 2000/01/23 10:41:11 itojun Exp $
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
 include/ucd-snmp/snmp.h
 include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
@@ -29,32 +31,32 @@ include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 lib/libsnmp.a
 lib/libsnmp.so.0.0
+man/man1/snmpbulkwalk.1
 man/man1/snmpcmd.1
+man/man1/snmpd.1
+man/man1/snmpdelta.1
 man/man1/snmpget.1
-man/man1/snmpset.1
-man/man1/snmpwalk.1
-man/man1/snmpbulkwalk.1
 man/man1/snmpgetnext.1
-man/man1/snmptest.1
 man/man1/snmpnetstat.1
-man/man1/snmptranslate.1
+man/man1/snmpset.1
 man/man1/snmpstatus.1
-man/man1/snmptrap.1
-man/man1/snmpdelta.1
-man/man1/snmpd.1
 man/man1/snmptable.1
-man/man3/snmp_api.3
+man/man1/snmptest.1
+man/man1/snmptranslate.1
+man/man1/snmptrap.1
+man/man1/snmpusm.1
+man/man1/snmpwalk.1
 man/man3/mib_api.3
-man/man3/snmp_sess_api.3
 man/man3/read_config.3
-man/man5/variables.5
-man/man5/snmpd.conf.5
-man/man5/snmptrapd.conf.5
+man/man3/snmp_api.3
+man/man3/snmp_sess_api.3
 man/man5/snmp.conf.5
 man/man5/snmp_config.5
+man/man5/snmpd.conf.5
+man/man5/snmptrapd.conf.5
+man/man5/variables.5
 man/man8/snmptrapd.8
 sbin/snmpd
 sbin/snmptrapd
@@ -70,6 +72,11 @@ share/snmp/mibs/IANAifType-MIB.txt
 share/snmp/mibs/IF-MIB.txt
 share/snmp/mibs/IP-MIB.txt
 share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/IPV6-ICMP-MIB.txt
+share/snmp/mibs/IPV6-MIB.txt
+share/snmp/mibs/IPV6-TC.txt
+share/snmp/mibs/IPV6-TCP-MIB.txt
+share/snmp/mibs/IPV6-UDP-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
 share/snmp/mibs/RFC1271-MIB.txt
@@ -93,6 +100,7 @@ share/snmp/mibs/UDP-MIB.txt
 @unexec /bin/rm -f %D/share/snmp/mibs/.index
 @exec mkdir -p %D/lib/snmp/dlmod
 @dirrm lib/snmp/dlmod
+@dirrm lib/snmp
 @dirrm share/snmp/mibs
 @dirrm share/snmp
 @dirrm share/examples/ucd-snmp
author	itojun <itojun@pkgsrc.org>	2000-01-23 10:41:09 +0000
committer	itojun <itojun@pkgsrc.org>	2000-01-23 10:41:09 +0000
commit	7a526062c8d90fab60f499788f098b4a5c7506ee (patch)
tree	882bea5f9e75f5114663cc1b82341c0c5162fd39 /net
parent	49e253fff1d490da3697b8eac63ad0442d5f6a51 (diff)
download	pkgsrc-7a526062c8d90fab60f499788f098b4a5c7506ee.tar.gz