Remove "ucd-snmp-current" package because "ucd-snmp" package was updated

to the same version but has an extra security fixe.

12 files changed, 1 insertions, 3798 deletions

diff --git a/net/Makefile b/net/Makefile
index 599c2c5a83a..f5143af4cd3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.274 2002/02/06 21:13:39 wiz Exp $
+# $NetBSD: Makefile,v 1.275 2002/02/13 16:43:34 tron Exp $
 #
 
 COMMENT=	Networking tools
@@ -208,7 +208,6 @@ SUBDIR+=	traceroute-as
 SUBDIR+=	trafshow
 SUBDIR+=	ttt
 SUBDIR+=	ucd-snmp
-SUBDIR+=	ucd-snmp-current
 SUBDIR+=	ucspi-tcp
 SUBDIR+=	unison
 SUBDIR+=	userppp
diff --git a/net/ucd-snmp-current/DESCR b/net/ucd-snmp-current/DESCR
deleted file mode 100644
index 341ba043ea6..00000000000
--- a/net/ucd-snmp-current/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
-
-This package contains a port and modified code of the CMU 2.1.2.1
-snmp agent.  It has been modified to allow extensibility quickly
-and easily.  It is far from the best and most configurable systems;
-but hey: its free.
-  
-We use this agent here to monitor known system problems before they
-take the machine over.  The agent can be easily configured to
-monitor the number of a given process running, run external scripts
-to check and report functional status.  Examples: mountd(s) under
-Ultrix 4.3 which tend to fork themselves crazy and eventually fill
-up the process table; On our hp700s, "amd" sometimes stops working,
-HP VUE hangs and fails to start X, etc.
diff --git a/net/ucd-snmp-current/Makefile b/net/ucd-snmp-current/Makefile
deleted file mode 100644
index 7949bc69905..00000000000
--- a/net/ucd-snmp-current/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2002/02/12 12:24:57 skrll Exp $
-
-DISTNAME=	ucd-snmp-4.2.3
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
-		ftp://ucd-snmp.ucdavis.edu/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
-		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://net-snmp.sourceforge.net/
-COMMENT=	Extensible SNMP implementation
-
-BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
-
-BUILD_DEFS+=	USE_INET6
-
-USE_BUILDLINK_ONLY=	
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == NetBSD && \
-	${LOWER_ARCH} == i386 && \
-	${OS_VERSION:M1.5.[12]*} != "")
-BROKEN=		Please update your sys/disklabel.h from the netbsd-1-5 branch
-.endif
-
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-#CPPFLAGS+=	-I${BUILDLINK_DIR}/include
-#LDFLAGS+=	-L${BUILDLINK_DIR}/lib
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-defaults --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} --with-logfile="/var/log/snmpd"
-CONFIGURE_ARGS+=--with-mib-modules="smux host"
-# NOTE: if you do not allow dummy values some tools such as
-# scotty/tkined may ignore results when they shouldn't.
-CONFIGURE_ARGS+=--with-dummy-values
-# NOTE: without this the default is USER@DOMAINNAME of the package builder
-CONFIGURE_ARGS+=--with-sys-contact="default_user@contact.domain"
-CONFIGURE_ARGS+=--with-sys-location="defaultlocation"
-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/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
-
-# deal with libwrap bogosity by providing these variables to programs which
-# do not supply them:
-post-extract:
-	@${ECHO} 'int allow_severity, deny_severity;' >${WRKSRC}/snmplib/libwrap.c
-	@${LN} ${WRKSRC}/s/netbsd.h ${WRKSRC}/s/netbsdelf.h
-
-pre-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf)
-.if ${OPSYS} == SunOS
-# Adapt for the fact that the default I've seen of ac_max_sed_cmds=90
-#will not work w/ built-in sed on Solaris.
-	(cd ${WRKSRC} && ${SED} \
-		's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \
-		configure > tmp && cp tmp configure && rm tmp)
-.endif
-
-post-build:
-	${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmpd.sh > ${WRKDIR}/snmpd
-	${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmptrapd.sh > ${WRKDIR}/snmptrapd
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod
-	${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKDIR}/snmptrapd ${PREFIX}/etc/rc.d
-
-.if (${OPSYS} == "NetBSD")
-CFLAGS+=	-Dnetbsd1
-.endif
-
-.include "../../security/openssl/buildlink.mk"	# USE_SSL=	yes
-.include "../../security/tcp_wrappers/buildlink.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ucd-snmp-current/PLIST b/net/ucd-snmp-current/PLIST
deleted file mode 100644
index 264e6336687..00000000000
--- a/net/ucd-snmp-current/PLIST
+++ /dev/null
@@ -1,226 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/05 22:39:06 skrll Exp $
-bin/encode_keychange
-bin/mib2c
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpconf
-bin/snmpdelta
-bin/snmpdf
-bin/snmpget
-bin/snmpgetnext
-bin/snmpinform
-bin/snmpnetstat
-bin/snmpset
-bin/snmpstatus
-bin/snmptable
-bin/snmptest
-bin/snmptranslate
-bin/snmptrap
-bin/snmpusm
-bin/snmpvacm
-bin/snmpwalk
-bin/tkmib
-etc/rc.d/snmpd
-etc/rc.d/snmptrapd
-include/ucd-snmp/agent_index.h
-include/ucd-snmp/agent_read_config.h
-include/ucd-snmp/agent_registry.h
-include/ucd-snmp/agent_trap.h
-include/ucd-snmp/asn1.h
-include/ucd-snmp/auto_nlist.h
-include/ucd-snmp/callback.h
-include/ucd-snmp/default_store.h
-include/ucd-snmp/ds_agent.h
-include/ucd-snmp/header_complex.h
-include/ucd-snmp/int64.h
-include/ucd-snmp/keytools.h
-include/ucd-snmp/mib.h
-include/ucd-snmp/mib_module_config.h
-include/ucd-snmp/mibincl.h
-include/ucd-snmp/parse.h
-include/ucd-snmp/read_config.h
-include/ucd-snmp/scapi.h
-include/ucd-snmp/snmp-tc.h
-include/ucd-snmp/snmp.h
-include/ucd-snmp/snmp_agent.h
-include/ucd-snmp/snmp_alarm.h
-include/ucd-snmp/snmp_api.h
-include/ucd-snmp/snmp_client.h
-include/ucd-snmp/snmp_debug.h
-include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp_logging.h
-include/ucd-snmp/snmp_parse_args.h
-include/ucd-snmp/snmp_vars.h
-include/ucd-snmp/snmpusm.h
-include/ucd-snmp/snmpv3.h
-include/ucd-snmp/struct.h
-include/ucd-snmp/system.h
-include/ucd-snmp/tools.h
-include/ucd-snmp/transform_oids.h
-include/ucd-snmp/ucd-snmp-agent-includes.h
-include/ucd-snmp/ucd-snmp-config.h
-include/ucd-snmp/ucd-snmp-includes.h
-include/ucd-snmp/util_funcs.h
-include/ucd-snmp/var_struct.h
-include/ucd-snmp/version.h
-lib/libsnmp.a
-lib/libsnmp.la
-lib/libsnmp.so
-lib/libsnmp-0.4.2.3.so
-lib/libucdagent.a
-lib/libucdagent.la
-lib/libucdagent.so
-lib/libucdagent-0.4.2.3.so
-lib/libucdmibs.a
-lib/libucdmibs.la
-lib/libucdmibs.so
-lib/libucdmibs-0.4.2.3.so
-man/man1/snmpbulkget.1
-man/man1/snmpbulkwalk.1
-man/man1/snmpcmd.1
-man/man1/snmpconf.1
-man/man1/snmpd.1
-man/man1/snmpdelta.1
-man/man1/snmpdf.1
-man/man1/snmpget.1
-man/man1/snmpgetnext.1
-man/man1/snmpinform.1
-man/man1/snmpnetstat.1
-man/man1/snmpset.1
-man/man1/snmpstatus.1
-man/man1/snmptable.1
-man/man1/snmptest.1
-man/man1/snmptranslate.1
-man/man1/snmptrap.1
-man/man1/snmpusm.1
-man/man1/snmpwalk.1
-man/man3/add_mibdir.3
-man/man3/add_module_replacement.3
-man/man3/default_store.3
-man/man3/get_module_node.3
-man/man3/init_mib.3
-man/man3/init_mib_internals.3
-man/man3/mib_api.3
-man/man3/print_description.3
-man/man3/print_mib.3
-man/man3/print_objid.3
-man/man3/print_value.3
-man/man3/print_variable.3
-man/man3/read_all_mibs.3
-man/man3/read_config.3
-man/man3/read_mib.3
-man/man3/read_module.3
-man/man3/read_module_node.3
-man/man3/read_objid.3
-man/man3/shutdown_mib.3
-man/man3/snmp_agent_api.3
-man/man3/snmp_alarm.3
-man/man3/snmp_api.3
-man/man3/snmp_api_errstring.3
-man/man3/snmp_close.3
-man/man3/snmp_error.3
-man/man3/snmp_free_pdu.3
-man/man3/snmp_open.3
-man/man3/snmp_perror.3
-man/man3/snmp_read.3
-man/man3/snmp_select_info.3
-man/man3/snmp_send.3
-man/man3/snmp_sess_api.3
-man/man3/snmp_sess_async_send.3
-man/man3/snmp_sess_close.3
-man/man3/snmp_sess_error.3
-man/man3/snmp_sess_init.3
-man/man3/snmp_sess_open.3
-man/man3/snmp_sess_perror.3
-man/man3/snmp_sess_read.3
-man/man3/snmp_sess_select_info.3
-man/man3/snmp_sess_send.3
-man/man3/snmp_sess_session.3
-man/man3/snmp_sess_timeout.3
-man/man3/snmp_set_mib_warnings.3
-man/man3/snmp_set_save_descriptions.3
-man/man3/snmp_timeout.3
-man/man3/snmp_trap_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
-share/examples/ucd-snmp/EXAMPLE.conf
-share/snmp/mib2c.conf
-share/snmp/mib2c.storage.conf
-share/snmp/mib2c.vartypes.conf
-share/snmp/mibs/AGENTX-MIB.txt
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HCNUM-TC.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-TYPES.txt
-share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/snmp/mibs/IANA-LANGUAGE-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/INET-ADDRESS-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IP-FORWARD-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/RFC-1215.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/SMUX-MIB.txt
-share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
-share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
-share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
-share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UCD-DEMO-MIB.txt
-share/snmp/mibs/UCD-DISKIO-MIB.txt
-share/snmp/mibs/UCD-DLMOD-MIB.txt
-share/snmp/mibs/UCD-IPFWACC-MIB.txt
-share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/snmpconf/snmp.conf/authopts
-share/snmp/snmpconf/snmp.conf/debugging
-share/snmp/snmpconf/snmp.conf/mibs
-share/snmp/snmpconf/snmp.conf/output
-share/snmp/snmpconf/snmpd.conf/acl
-share/snmp/snmpconf/snmpd.conf/basic_setup
-share/snmp/snmpconf/snmpd.conf/extending
-share/snmp/snmpconf/snmpd.conf/monitor
-share/snmp/snmpconf/snmpd.conf/operation
-share/snmp/snmpconf/snmpd.conf/system
-share/snmp/snmpconf/snmpd.conf/trapsinks
-share/snmp/snmpconf/snmptrapd.conf/formatting
-share/snmp/snmpconf/snmptrapd.conf/traphandle
-@unexec /bin/rm -f %D/share/snmp/mibs/.index
-@dirrm share/snmp/snmpconf/snmp.conf
-@dirrm share/snmp/snmpconf/snmpd.conf
-@dirrm share/snmp/snmpconf/snmptrapd.conf
-@dirrm share/snmp/snmpconf
-@dirrm share/snmp/mibs
-@dirrm share/snmp
-@dirrm share/examples/ucd-snmp
-@exec ${MKDIR} -p %D/lib/snmp/dlmod
-@dirrm lib/snmp/dlmod
-@dirrm lib/snmp
-@dirrm include/ucd-snmp
diff --git a/net/ucd-snmp-current/distinfo b/net/ucd-snmp-current/distinfo
deleted file mode 100644
index 8e654f3f741..00000000000
--- a/net/ucd-snmp-current/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.8 2002/01/25 10:27:49 skrll Exp $
-
-SHA1 (ucd-snmp-4.2.3.tar.gz) = ee4f9543dcfef129313db0a2d2c49230a1ba1c4f
-Size (ucd-snmp-4.2.3.tar.gz) = 1658006 bytes
-SHA1 (patch-aa) = 43a0b1f1b0deb2403b8950684e759d40819fce2f
-SHA1 (patch-ab) = a4bd7337b6c57791d5d0ab936d0fac6c2b1bd497
-SHA1 (patch-af) = eb2fd9cfd1830e9a931bcd712a83938bc04dca42
-SHA1 (patch-ag) = 4e51af5d595d26e4b641757ad27737af76286893
-SHA1 (patch-ah) = 31c8ac63b9e21cb198481d4a299faf0cf9427788
diff --git a/net/ucd-snmp-current/files/snmpd.sh b/net/ucd-snmp-current/files/snmpd.sh
deleted file mode 100644
index 887202a7b8c..00000000000
--- a/net/ucd-snmp-current/files/snmpd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $NetBSD: snmpd.sh,v 1.1 2001/08/30 23:31:30 wrstuden Exp $
-
-# PID file:
-PF=/var/run/snmpd.pid
-
-
-if [ -f /etc/snmp/snmpd.conf ]
-then
-    SNMPD_CFG="-c /etc/snmp/snmpd.conf"
-fi
-
-case $1 in
-start)
-	if [ -x @PREFIX@/sbin/snmpd ]
-	then
-	    echo -n ' snmpd'
-	    @PREFIX@/sbin/snmpd -s -P ${PF} -A ${SNMPD_CFG}
-	fi
-	;;
-stop)
-	if [ -f ${PF} ]; then
-		kill `cat ${PF}`
-		rm -f ${PF}
-	else
-		echo "$0: snmpd not running or PID not recorded!" 1>&2
-	fi
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-
diff --git a/net/ucd-snmp-current/files/snmptrapd.sh b/net/ucd-snmp-current/files/snmptrapd.sh
deleted file mode 100644
index 58a87832109..00000000000
--- a/net/ucd-snmp-current/files/snmptrapd.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: snmptrapd.sh,v 1.1 2001/08/30 23:31:30 wrstuden Exp $
-
-# PID file:
-PF=/var/run/snmptrapd.pid
-
-
-case $1 in
-start)
-	if [ -x @PREFIX@/sbin/snmptrapd ]
-	then
-		echo -n ' snmptrapd'
-		@PREFIX@/sbin/snmptrapd -s -l 1 -u ${PF}
-	fi
-	;;
-stop)
-	if [ -f ${PF} ]; then
-		kill `cat ${PF}`
-		rm -f ${PF}
-	else
-		echo "$0: snmptrapd not running or PID not recorded!" 1>&2
-	fi
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-esac
diff --git a/net/ucd-snmp-current/patches/patch-aa b/net/ucd-snmp-current/patches/patch-aa
deleted file mode 100644
index 2d66b8c2a36..00000000000
--- a/net/ucd-snmp-current/patches/patch-aa
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/01/11 06:42:36 itojun Exp $
-
---- configure.in.orig	Tue Nov 27 23:51:57 2001
-+++ configure.in	Fri Jan 11 15:28:57 2002
-@@ -1022,23 +1022,23 @@
- dnl
- dnl now check for rpm using the appropriate db library
- dnl
--AC_CHECK_LIB(rpm, rpmdbOpen,[
--  AC_DEFINE(HAVE_LIBRPM)
--  LIBS="-lrpm $LIBS"
--  CFLAGS="$CFLAGS -I/usr/include/rpm"
--],,-lz)
-+#AC_CHECK_LIB(rpm, rpmdbOpen,[
-+#  AC_DEFINE(HAVE_LIBRPM)
-+#  LIBS="-lrpm $LIBS"
-+#  CFLAGS="$CFLAGS -I/usr/include/rpm"
-+#],,-lz)
- 
- dnl
- dnl now check for rpm using the appropriate db library
- dnl
--if test x$ac_cv_lib_rpm_rpmdbOpen = xno; then
--  unset ac_cv_lib_rpm_rpmdbOpen
--  AC_CHECK_LIB(rpm, rpmdbOpen,[
--    AC_DEFINE(HAVE_LIBRPM)
--    LIBS="-lrpm -lpopt $LIBS"
--    CFLAGS="$CFLAGS -I/usr/include/rpm"
--  ],,-lpopt -lz)
--fi
-+#if test x$ac_cv_lib_rpm_rpmdbOpen = xno; then
-+#  unset ac_cv_lib_rpm_rpmdbOpen
-+#  AC_CHECK_LIB(rpm, rpmdbOpen,[
-+#    AC_DEFINE(HAVE_LIBRPM)
-+#    LIBS="-lrpm -lpopt $LIBS"
-+#    CFLAGS="$CFLAGS -I/usr/include/rpm"
-+#  ],,-lpopt -lz)
-+#fi
- 
- 
- dnl Replace `main' with a function in -lkstat:
-@@ -1064,7 +1064,7 @@
- AC_HEADER_STDC
- AC_HEADER_DIRENT
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h)
-+AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h)
- dnl FreeBSD required headers
- AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h sys/disklabel.h machine/types.h sys/socketvar.h)
- dnl Linux
-@@ -1072,7 +1072,7 @@
- dnl NetBSD required headers
- AC_CHECK_HEADERS(arpa/inet.h kvm.h sys/pool.h)
- dnl BSDi2 headers
--AC_CHECK_HEADERS(sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h)
-+AC_CHECK_HEADERS(sys/mount.h ufs/ufs/dinode.h)
- dnl BSDi3 headers
- AC_CHECK_HEADERS(sys/stat.h sys/vnode.h ufs/ufs/quota.h ufs/ufs/inode.h)
- dnl irix headers
-@@ -1329,11 +1329,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_dst, no)
- 
-@@ -1347,11 +1343,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ],[
- 
-@@ -1371,11 +1363,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ],[
- struct rtentry rt; 
-@@ -1428,11 +1416,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ],[
- struct rtentry rt; 
-@@ -1452,11 +1436,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_unit)
- 
-@@ -1465,11 +1445,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_refcnt)
- 
-@@ -1478,11 +1454,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_hash)
- 
-@@ -1491,11 +1463,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_use)
- 
diff --git a/net/ucd-snmp-current/patches/patch-ab b/net/ucd-snmp-current/patches/patch-ab
deleted file mode 100644
index 48b7fd61912..00000000000
--- a/net/ucd-snmp-current/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/09/11 01:46:31 wrstuden Exp $
-
---- snmplib/Makefile.in.orig	Tue Jan 30 15:26:05 2001
-+++ snmplib/Makefile.in	Tue Jan 30 15:27:03 2001
-@@ -40,7 +40,7 @@
- 	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	mt_support.c \
--	snprintf.c strtol.c strtoul.c
-+	snprintf.c strtol.c strtoul.c libwrap.c
- 
- OBJS=	snmp_client.o mib.o parse.o snmp_api.o snmp.o 		\
- 	snmp_auth.o asn1.o md5.o snmp_parse_args.o	  	\
-@@ -49,7 +49,7 @@
- 	snmpv3.o snmpusm.o lcd_time.o keytools.o	  	\
- 	scapi.o callback.o default_store.o snmp_alarm.o	  	\
- 	mt_support.o \
--	snprintf.o strtol.o strtoul.o
-+	snprintf.o strtol.o strtoul.o libwrap.o
- 
- LOBJS=	snmp_client.lo mib.lo parse.lo snmp_api.lo snmp.lo 	\
- 	snmp_auth.lo asn1.lo md5.lo snmp_parse_args.lo		\
-@@ -58,7 +58,7 @@
- 	snmpv3.lo snmpusm.lo lcd_time.lo keytools.lo	  	\
- 	scapi.lo callback.lo default_store.lo snmp_alarm.lo	\
- 	mt_support.lo \
--	snprintf.lo strtol.lo strtoul.lo
-+	snprintf.lo strtol.lo strtoul.lo libwrap.lo
- 
- # just in case someone wants to remove libtool, change this to OBJS.
- TOBJS=$(LOBJS)
diff --git a/net/ucd-snmp-current/patches/patch-af b/net/ucd-snmp-current/patches/patch-af
deleted file mode 100644
index 86ca0178080..00000000000
--- a/net/ucd-snmp-current/patches/patch-af
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-af,v 1.5 2001/09/11 01:46:31 wrstuden Exp $
-
---- agent/mibgroup/mibII/interfaces.c.orig	Tue Jan 30 15:36:04 2001
-+++ agent/mibgroup/mibII/interfaces.c	Tue Jan 30 15:42:42 2001
-@@ -132,7 +132,7 @@
- #ifdef 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
- #    ifndef netbsd1
-@@ -1549,19 +1549,34 @@
- 	    cp = strchr(saveName, '\0');
- 	    string_append_int (cp, ifnet.if_unit);
- #endif
--	    if (1 || strcmp(saveName,"lo0") != 0) {  /* XXX */
-+	    if (1 ) {  /* XXX */
- 		/*
- 		 *  Try to find an address for this interface
- 		 */
- 
- 		auto_nlist(IFADDR_SYMBOL, (char *)&ia, sizeof(ia));
-+#ifdef netbsd1
-+		ia=(struct in_ifaddr *)ifnet.if_addrlist.tqh_first;
-+#endif
- 		while (ia) {
- 		    klookup((unsigned long)ia ,  (char *)&in_ifaddr, sizeof(in_ifaddr));
-+#ifdef netbsd1
-+#define CP(x) ((char *)(x))
-+{ char *cp; struct sockaddr * sa;
-+		    cp = (CP(in_ifaddr.ia_ifa.ifa_addr) - CP(ia)) +
-+			CP(&in_ifaddr); sa = (struct sockaddr *)cp;
-+if (sa->sa_family==AF_INET)
-+#endif
- 		    if (in_ifaddr.ia_ifp == ifnetaddr) {
-                         has_ipaddr = 1; /* this IF has IP-address */
-                         break;
-                     }
-+}
-+#ifdef netbsd1
-+		    ia=(struct in_ifaddr *)in_ifaddr.ia_ifa.ifa_list.tqe_next;
-+#else
- 		    ia = in_ifaddr.ia_next;
-+#endif
- 		}
- 
- #if !defined(netbsd1) && !defined(freebsd2) && !defined(openbsd2) && !defined(STRUCT_IFNET_HAS_IF_ADDRLIST)
diff --git a/net/ucd-snmp-current/patches/patch-ag b/net/ucd-snmp-current/patches/patch-ag
deleted file mode 100644
index 24b319bd000..00000000000
--- a/net/ucd-snmp-current/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2001/09/11 01:46:31 wrstuden Exp $
-
---- agent/mibgroup/mibII/ipAddr.c.orig	Tue Jan 30 16:00:58 2001
-+++ agent/mibgroup/mibII/ipAddr.c	Tue Jan 30 16:07:06 2001
-@@ -243,7 +243,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;
-+#else
- 	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
-+#endif
- #endif
- 	    return(u_char *) &long_return;	   
- 	case IPADREASMMAX:
diff --git a/net/ucd-snmp-current/patches/patch-ah b/net/ucd-snmp-current/patches/patch-ah
deleted file mode 100644
index b7bd8f6c165..00000000000
--- a/net/ucd-snmp-current/patches/patch-ah
+++ /dev/null
@@ -1,3140 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/01/25 10:27:50 skrll Exp $
-
---- configure.orig	Fri Jan 25 09:47:07 2002
-+++ configure
-@@ -7791,108 +7791,24 @@
- 
- fi
- 
--echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
--echo "configure:7796: 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
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lrpm -lz $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 7804 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char rpmdbOpen();
--
--int main() {
--rpmdbOpen()
--; return 0; }
--EOF
--if { (eval echo configure:7815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  
--  cat >> confdefs.h <<\EOF
--#define HAVE_LIBRPM 1
--EOF
--
--  LIBS="-lrpm $LIBS"
--  CFLAGS="$CFLAGS -I/usr/include/rpm"
--
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--
--if test x$ac_cv_lib_rpm_rpmdbOpen = xno; then
--  unset ac_cv_lib_rpm_rpmdbOpen
--  echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
--echo "configure:7846: 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
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lrpm -lpopt -lz $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 7854 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char rpmdbOpen();
--
--int main() {
--rpmdbOpen()
--; return 0; }
--EOF
--if { (eval echo configure:7865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  
--    cat >> confdefs.h <<\EOF
--#define HAVE_LIBRPM 1
--EOF
--
--    LIBS="-lrpm -lpopt $LIBS"
--    CFLAGS="$CFLAGS -I/usr/include/rpm"
--  
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--fi
-+#AC_CHECK_LIB(rpm, rpmdbOpen,[
-+#  AC_DEFINE(HAVE_LIBRPM)
-+#  LIBS="-lrpm $LIBS"
-+#  CFLAGS="$CFLAGS -I/usr/include/rpm"
-+#],,-lz)
-+
-+#if test x$ac_cv_lib_rpm_rpmdbOpen = xno; then
-+#  unset ac_cv_lib_rpm_rpmdbOpen
-+#  AC_CHECK_LIB(rpm, rpmdbOpen,[
-+#    AC_DEFINE(HAVE_LIBRPM)
-+#    LIBS="-lrpm -lpopt $LIBS"
-+#    CFLAGS="$CFLAGS -I/usr/include/rpm"
-+#  ],,-lpopt -lz)
-+#fi
- 
- 
- echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6
--echo "configure:7896: checking for kstat_lookup in -lkstat" >&5
-+echo "configure:7812: 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
-@@ -7900,7 +7816,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lkstat  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7904 "configure"
-+#line 7820 "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
-@@ -7911,7 +7827,7 @@
- kstat_lookup()
- ; return 0; }
- EOF
--if { (eval echo configure:7915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7831: \"$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
-@@ -7939,7 +7855,7 @@
- fi
- 
- echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
--echo "configure:7943: checking for kvm_read in -lkvm" >&5
-+echo "configure:7859: 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
-@@ -7947,7 +7863,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lkvm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7951 "configure"
-+#line 7867 "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
-@@ -7958,7 +7874,7 @@
- kvm_read()
- ; return 0; }
- EOF
--if { (eval echo configure:7962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7878: \"$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
-@@ -7986,7 +7902,7 @@
- fi
- 
- echo $ac_n "checking for nlist in -lmld""... $ac_c" 1>&6
--echo "configure:7990: checking for nlist in -lmld" >&5
-+echo "configure:7906: 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
-@@ -7994,7 +7910,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7998 "configure"
-+#line 7914 "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
-@@ -8005,7 +7921,7 @@
- nlist()
- ; return 0; }
- EOF
--if { (eval echo configure:8009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7925: \"$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
-@@ -8033,7 +7949,7 @@
- fi
- 
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:8037: checking for dlopen in -ldl" >&5
-+echo "configure:7953: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8041,7 +7957,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8045 "configure"
-+#line 7961 "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
-@@ -8052,7 +7968,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7972: \"$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
-@@ -8083,7 +7999,7 @@
- if test "x$tryopenssl" != "xno"; then
-     if test "x$tryrsaref" != "xno"; then
-          echo $ac_n "checking for RSAPrivateDecrypt in -lrsaref""... $ac_c" 1>&6
--echo "configure:8087: checking for RSAPrivateDecrypt in -lrsaref" >&5
-+echo "configure:8003: checking for RSAPrivateDecrypt in -lrsaref" >&5
- ac_lib_var=`echo rsaref'_'RSAPrivateDecrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8091,7 +8007,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lrsaref  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8095 "configure"
-+#line 8011 "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
-@@ -8102,7 +8018,7 @@
- RSAPrivateDecrypt()
- ; return 0; }
- EOF
--if { (eval echo configure:8106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8022: \"$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
-@@ -8130,7 +8046,7 @@
- fi
- 
-          echo $ac_n "checking for RSA_PKCS1_RSAref in -lRSAglue""... $ac_c" 1>&6
--echo "configure:8134: checking for RSA_PKCS1_RSAref in -lRSAglue" >&5
-+echo "configure:8050: checking for RSA_PKCS1_RSAref in -lRSAglue" >&5
- ac_lib_var=`echo RSAglue'_'RSA_PKCS1_RSAref | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8138,7 +8054,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lRSAglue  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8142 "configure"
-+#line 8058 "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
-@@ -8149,7 +8065,7 @@
- RSA_PKCS1_RSAref()
- ; return 0; }
- EOF
--if { (eval echo configure:8153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8069: \"$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
-@@ -8179,7 +8095,7 @@
-     fi
- 
-     echo $ac_n "checking for EVP_md5 in -lcrypto""... $ac_c" 1>&6
--echo "configure:8183: checking for EVP_md5 in -lcrypto" >&5
-+echo "configure:8099: checking for EVP_md5 in -lcrypto" >&5
- ac_lib_var=`echo crypto'_'EVP_md5 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8187,7 +8103,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypto  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8191 "configure"
-+#line 8107 "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
-@@ -8198,7 +8114,7 @@
- EVP_md5()
- ; return 0; }
- EOF
--if { (eval echo configure:8202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8118: \"$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
-@@ -8228,12 +8144,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:8232: checking for ANSI C header files" >&5
-+echo "configure:8148: 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 8237 "configure"
-+#line 8153 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -8241,7 +8157,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8161: \"$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*
-@@ -8258,7 +8174,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 8262 "configure"
-+#line 8178 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -8276,7 +8192,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 8280 "configure"
-+#line 8196 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -8297,7 +8213,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8301 "configure"
-+#line 8217 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -8308,7 +8224,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:8228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -8336,12 +8252,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:8340: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:8256: 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 8345 "configure"
-+#line 8261 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -8349,7 +8265,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:8353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -8374,7 +8290,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:8378: checking for opendir in -ldir" >&5
-+echo "configure:8294: 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
-@@ -8382,7 +8298,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8386 "configure"
-+#line 8302 "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
-@@ -8393,7 +8309,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:8397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8313: \"$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
-@@ -8415,7 +8331,7 @@
- 
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:8419: checking for opendir in -lx" >&5
-+echo "configure:8335: 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
-@@ -8423,7 +8339,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8427 "configure"
-+#line 8343 "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
-@@ -8434,7 +8350,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:8438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8354: \"$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
-@@ -8457,12 +8373,12 @@
- fi
- 
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:8461: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo "configure:8377: 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 8466 "configure"
-+#line 8382 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -8478,7 +8394,7 @@
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:8482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_sys_wait_h=yes
- else
-@@ -8498,21 +8414,21 @@
- 
- fi
- 
--for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h pwd.h grp.h utmpx.h
-+for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8506: checking for $ac_hdr" >&5
-+echo "configure:8422: 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 8511 "configure"
-+#line 8427 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8432: \"$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*
-@@ -8542,17 +8458,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8546: checking for $ac_hdr" >&5
-+echo "configure:8462: 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 8551 "configure"
-+#line 8467 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8472: \"$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*
-@@ -8582,17 +8498,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8586: checking for $ac_hdr" >&5
-+echo "configure:8502: 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 8591 "configure"
-+#line 8507 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8512: \"$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*
-@@ -8622,17 +8538,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8626: checking for $ac_hdr" >&5
-+echo "configure:8542: 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 8631 "configure"
-+#line 8547 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8552: \"$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*
-@@ -8658,21 +8574,21 @@
- fi
- done
- 
--for ac_hdr in sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h
-+for ac_hdr in sys/mount.h ufs/ufs/dinode.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8666: checking for $ac_hdr" >&5
-+echo "configure:8582: 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 8671 "configure"
-+#line 8587 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8592: \"$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*
-@@ -8702,17 +8618,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8706: checking for $ac_hdr" >&5
-+echo "configure:8622: 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 8711 "configure"
-+#line 8627 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8632: \"$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*
-@@ -8742,17 +8658,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8746: checking for $ac_hdr" >&5
-+echo "configure:8662: 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 8751 "configure"
-+#line 8667 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8672: \"$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*
-@@ -8782,17 +8698,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8786: checking for $ac_hdr" >&5
-+echo "configure:8702: 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 8791 "configure"
-+#line 8707 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8712: \"$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*
-@@ -8822,17 +8738,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8826: checking for $ac_hdr" >&5
-+echo "configure:8742: 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 8831 "configure"
-+#line 8747 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8752: \"$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*
-@@ -8862,17 +8778,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8866: checking for $ac_hdr" >&5
-+echo "configure:8782: 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 8871 "configure"
-+#line 8787 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8792: \"$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*
-@@ -8902,17 +8818,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8906: checking for $ac_hdr" >&5
-+echo "configure:8822: 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 8911 "configure"
-+#line 8827 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8832: \"$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*
-@@ -8942,17 +8858,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8946: checking for $ac_hdr" >&5
-+echo "configure:8862: 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 8951 "configure"
-+#line 8867 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8872: \"$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*
-@@ -8973,7 +8889,7 @@
- #define $ac_tr_hdr 1
- EOF
-  echo $ac_n "checking for pkginfo in -ladm""... $ac_c" 1>&6
--echo "configure:8977: checking for pkginfo in -ladm" >&5
-+echo "configure:8893: checking for pkginfo in -ladm" >&5
- ac_lib_var=`echo adm'_'pkginfo | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8981,7 +8897,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ladm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8985 "configure"
-+#line 8901 "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
-@@ -8992,7 +8908,7 @@
- pkginfo()
- ; return 0; }
- EOF
--if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8912: \"$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
-@@ -9025,17 +8941,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:9029: checking for $ac_hdr" >&5
-+echo "configure:8945: 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 9034 "configure"
-+#line 8950 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8955: \"$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*
-@@ -9065,17 +8981,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:9069: checking for $ac_hdr" >&5
-+echo "configure:8985: 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 9074 "configure"
-+#line 8990 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8995: \"$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*
-@@ -9105,17 +9021,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:9109: checking for $ac_hdr" >&5
-+echo "configure:9025: 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 9114 "configure"
-+#line 9030 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9035: \"$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*
-@@ -9145,17 +9061,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:9149: checking for $ac_hdr" >&5
-+echo "configure:9065: 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 9154 "configure"
-+#line 9070 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9075: \"$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*
-@@ -9183,12 +9099,12 @@
- 
- 
- echo $ac_n "checking for netinet/in_pcb.h""... $ac_c" 1>&6
--echo "configure:9187: checking for netinet/in_pcb.h" >&5
-+echo "configure:9103: checking for netinet/in_pcb.h" >&5
- if eval "test \"`echo '$''{'cv_have_netinet_in_pcb_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-    cat > conftest.$ac_ext <<EOF
--#line 9192 "configure"
-+#line 9108 "configure"
- #include "confdefs.h"
- 
- #include <netinet/in.h>
-@@ -9196,7 +9112,7 @@
- 
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9116: \"$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*
-@@ -9223,17 +9139,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:9227: checking for $ac_hdr" >&5
-+echo "configure:9143: 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 9232 "configure"
-+#line 9148 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9153: \"$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*
-@@ -9263,7 +9179,7 @@
- # Extract the first word of "lpstat", so it can be a program name with args.
- set dummy lpstat; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:9267: checking for $ac_word" >&5
-+echo "configure:9183: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_LPSTAT_PATH'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -9308,12 +9224,12 @@
- for ac_func in cgetnext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:9312: checking for $ac_func" >&5
-+echo "configure:9228: 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 9317 "configure"
-+#line 9233 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -9336,7 +9252,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9256: \"$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
-@@ -9368,7 +9284,7 @@
- fi
- 
- echo $ac_n "checking for authentication support""... $ac_c" 1>&6
--echo "configure:9372: checking for authentication support" >&5
-+echo "configure:9288: checking for authentication support" >&5
- if test "x$ac_cv_lib_crypto_EVP_md5" != "xyes" -o "x$ac_cv_header_openssl_hmac_h" != "xyes" -o "x$ac_cv_header_openssl_hmac_h" != "xyes"; then
-     cat >> confdefs.h <<\EOF
- #define USE_INTERNAL_MD5 1
-@@ -9395,12 +9311,12 @@
- fi
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:9399: checking for off_t" >&5
-+echo "configure:9315: 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 9404 "configure"
-+#line 9320 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -9428,12 +9344,12 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:9432: checking for pid_t" >&5
-+echo "configure:9348: 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 9437 "configure"
-+#line 9353 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -9461,12 +9377,12 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:9465: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:9381: 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 9470 "configure"
-+#line 9386 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -9475,7 +9391,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:9479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-@@ -9497,12 +9413,12 @@
- 
- 
- echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
--echo "configure:9501: checking for in_addr_t" >&5
-+echo "configure:9417: 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 9506 "configure"
-+#line 9422 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -9534,7 +9450,7 @@
- fi
- 
- echo $ac_n "checking for correct flags to ps""... $ac_c" 1>&6
--echo "configure:9538: checking for correct flags to ps" >&5
-+echo "configure:9454: 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
-@@ -9578,14 +9494,14 @@
-     { echo "configure: error: Endianness has been specified, but you are not cross-compiling." 1>&2; exit 1; }
-   fi
-   echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:9582: checking whether byte ordering is bigendian" >&5
-+echo "configure:9498: 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 9589 "configure"
-+#line 9505 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -9596,11 +9512,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:9600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9516: \"$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 9604 "configure"
-+#line 9520 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -9611,7 +9527,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:9615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_bigendian=yes
- else
-@@ -9631,7 +9547,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9635 "configure"
-+#line 9551 "configure"
- #include "confdefs.h"
- main () {
-   /* Are we little or big endian?  From Harbison&Steele.  */
-@@ -9644,7 +9560,7 @@
-   exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9564: \"$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
-@@ -9672,19 +9588,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:9676: checking for working alloca.h" >&5
-+echo "configure:9592: 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 9681 "configure"
-+#line 9597 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:9688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9604: \"$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
-@@ -9705,12 +9621,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:9709: checking for alloca" >&5
-+echo "configure:9625: 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 9714 "configure"
-+#line 9630 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -9738,7 +9654,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:9742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9658: \"$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
-@@ -9770,12 +9686,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:9774: checking whether alloca needs Cray hooks" >&5
-+echo "configure:9690: 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 9779 "configure"
-+#line 9695 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -9800,12 +9716,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:9804: checking for $ac_func" >&5
-+echo "configure:9720: 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 9809 "configure"
-+#line 9725 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -9828,7 +9744,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9748: \"$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
-@@ -9855,7 +9771,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:9859: checking stack direction for C alloca" >&5
-+echo "configure:9775: 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
-@@ -9863,7 +9779,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9867 "configure"
-+#line 9783 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -9882,7 +9798,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:9886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9802: \"$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
-@@ -9905,13 +9821,13 @@
- 
- if test $ac_cv_prog_gcc = yes; then
-     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
--echo "configure:9909: checking whether ${CC-cc} needs -traditional" >&5
-+echo "configure:9825: 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 9915 "configure"
-+#line 9831 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- Autoconf TIOCGETP
-@@ -9929,7 +9845,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat > conftest.$ac_ext <<EOF
--#line 9933 "configure"
-+#line 9849 "configure"
- #include "confdefs.h"
- #include <termio.h>
- Autoconf TCGETA
-@@ -9951,7 +9867,7 @@
- fi
- 
- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:9955: checking for 8-bit clean memcmp" >&5
-+echo "configure:9871: 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
-@@ -9959,7 +9875,7 @@
-   ac_cv_func_memcmp_clean=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 9963 "configure"
-+#line 9879 "configure"
- #include "confdefs.h"
- 
- main()
-@@ -9969,7 +9885,7 @@
- }
- 
- EOF
--if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9889: \"$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
-@@ -9987,12 +9903,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:9991: checking return type of signal handlers" >&5
-+echo "configure:9907: 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 9996 "configure"
-+#line 9912 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -10009,7 +9925,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:10013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -10029,7 +9945,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:10033: checking for getmntent in -lsun" >&5
-+echo "configure:9949: 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
-@@ -10037,7 +9953,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsun  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10041 "configure"
-+#line 9957 "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
-@@ -10048,7 +9964,7 @@
- getmntent()
- ; return 0; }
- EOF
--if { (eval echo configure:10052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9968: \"$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
-@@ -10067,7 +9983,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
--echo "configure:10071: checking for getmntent in -lseq" >&5
-+echo "configure:9987: 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
-@@ -10075,7 +9991,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lseq  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10079 "configure"
-+#line 9995 "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
-@@ -10086,7 +10002,7 @@
- getmntent()
- ; return 0; }
- EOF
--if { (eval echo configure:10090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10006: \"$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
-@@ -10105,7 +10021,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
--echo "configure:10109: checking for getmntent in -lgen" >&5
-+echo "configure:10025: 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
-@@ -10113,7 +10029,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgen  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 10117 "configure"
-+#line 10033 "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
-@@ -10124,7 +10040,7 @@
- getmntent()
- ; return 0; }
- EOF
--if { (eval echo configure:10128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10044: \"$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
-@@ -10149,12 +10065,12 @@
- fi
- 
- echo $ac_n "checking for getmntent""... $ac_c" 1>&6
--echo "configure:10153: checking for getmntent" >&5
-+echo "configure:10069: 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 10158 "configure"
-+#line 10074 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char getmntent(); below.  */
-@@ -10177,7 +10093,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10097: \"$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
-@@ -10202,12 +10118,12 @@
- for ac_func in setmntent gethostname uname gettimeofday select socket strtol strtoul
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10206: checking for $ac_func" >&5
-+echo "configure:10122: 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 10211 "configure"
-+#line 10127 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10230,7 +10146,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10150: \"$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
-@@ -10257,12 +10173,12 @@
- for ac_func in strchr strdup memcpy memmove index bcopy strcasestr regcomp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10261: checking for $ac_func" >&5
-+echo "configure:10177: 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 10266 "configure"
-+#line 10182 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10285,7 +10201,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10205: \"$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
-@@ -10312,12 +10228,12 @@
- for ac_func in signal sigset sigblock sighold strerror setenv vsnprintf snprintf
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10316: checking for $ac_func" >&5
-+echo "configure:10232: 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 10321 "configure"
-+#line 10237 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10340,7 +10256,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10260: \"$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
-@@ -10367,12 +10283,12 @@
- for ac_func in sigaction
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10371: checking for $ac_func" >&5
-+echo "configure:10287: 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 10376 "configure"
-+#line 10292 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10395,7 +10311,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10315: \"$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
-@@ -10422,12 +10338,12 @@
- for ac_func in snprintf strtoul
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10426: checking for $ac_func" >&5
-+echo "configure:10342: 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 10431 "configure"
-+#line 10347 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10450,7 +10366,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10370: \"$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
-@@ -10477,12 +10393,12 @@
- for ac_func in random lrand48 rand
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10481: checking for $ac_func" >&5
-+echo "configure:10397: 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 10486 "configure"
-+#line 10402 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10505,7 +10421,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10425: \"$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
-@@ -10532,12 +10448,12 @@
- for ac_func in execv system fork getpid strncasecmp sigalrm
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10536: checking for $ac_func" >&5
-+echo "configure:10452: 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 10541 "configure"
-+#line 10457 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10560,7 +10476,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10480: \"$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
-@@ -10587,12 +10503,12 @@
- for ac_func in rpmGetPath
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10591: checking for $ac_func" >&5
-+echo "configure:10507: 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 10596 "configure"
-+#line 10512 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10615,7 +10531,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10535: \"$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
-@@ -10643,12 +10559,12 @@
- for ac_func in getloadavg
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10647: checking for $ac_func" >&5
-+echo "configure:10563: 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 10652 "configure"
-+#line 10568 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10671,7 +10587,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10591: \"$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
-@@ -10698,12 +10614,12 @@
- for ac_func in kvm_openfiles nlist knlist
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10702: checking for $ac_func" >&5
-+echo "configure:10618: 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 10707 "configure"
-+#line 10623 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10726,7 +10642,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10646: \"$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
-@@ -10753,12 +10669,12 @@
- for ac_func in statvfs statfs
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10757: checking for $ac_func" >&5
-+echo "configure:10673: 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 10762 "configure"
-+#line 10678 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10781,7 +10697,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10701: \"$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
-@@ -10808,12 +10724,12 @@
- for ac_func in getdtablesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10812: checking for $ac_func" >&5
-+echo "configure:10728: 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 10817 "configure"
-+#line 10733 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10836,7 +10752,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10756: \"$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
-@@ -10863,12 +10779,12 @@
- for ac_func in getfsstat kvm_getprocs
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10867: checking for $ac_func" >&5
-+echo "configure:10783: 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 10872 "configure"
-+#line 10788 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10891,7 +10807,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10811: \"$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
-@@ -10918,12 +10834,12 @@
- for ac_func in usleep
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10922: checking for $ac_func" >&5
-+echo "configure:10838: 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 10927 "configure"
-+#line 10843 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -10946,7 +10862,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:10950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10866: \"$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
-@@ -10973,12 +10889,12 @@
- for ac_func in setlocale
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10977: checking for $ac_func" >&5
-+echo "configure:10893: 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 10982 "configure"
-+#line 10898 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11001,7 +10917,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10921: \"$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
-@@ -11028,12 +10944,12 @@
- for ac_func in tcgetattr
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11032: checking for $ac_func" >&5
-+echo "configure:10948: 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 11037 "configure"
-+#line 10953 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11056,7 +10972,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10976: \"$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
-@@ -11083,12 +10999,12 @@
- for ac_func in if_nameindex if_freenameindex
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11087: checking for $ac_func" >&5
-+echo "configure:11003: 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 11092 "configure"
-+#line 11008 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11111,7 +11027,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11031: \"$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
-@@ -11138,12 +11054,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11142: checking for $ac_func" >&5
-+echo "configure:11058: 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 11147 "configure"
-+#line 11063 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11166,7 +11082,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11086: \"$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
-@@ -11193,12 +11109,12 @@
- for ac_func in dlopen
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11197: checking for $ac_func" >&5
-+echo "configure:11113: 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 11202 "configure"
-+#line 11118 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11221,7 +11137,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11141: \"$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
-@@ -11248,12 +11164,12 @@
- for ac_func in mkstemp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11252: checking for $ac_func" >&5
-+echo "configure:11168: 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 11257 "configure"
-+#line 11173 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11276,7 +11192,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11196: \"$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
-@@ -11303,12 +11219,12 @@
- for ac_func in getpwnam getgrnam setgid setuid setgroups
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:11307: checking for $ac_func" >&5
-+echo "configure:11223: 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 11312 "configure"
-+#line 11228 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -11331,7 +11247,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11251: \"$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
-@@ -11357,12 +11273,12 @@
- 
- 
- echo $ac_n "checking for SIOCGIFADDR in sys/ioctl.h""... $ac_c" 1>&6
--echo "configure:11361: checking for SIOCGIFADDR in sys/ioctl.h" >&5
-+echo "configure:11277: 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 11366 "configure"
-+#line 11282 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_IOCTL_H
-@@ -11395,7 +11311,7 @@
- 
- # ultrix
- echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
--echo "configure:11399: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-+echo "configure:11315: 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
-@@ -11403,7 +11319,7 @@
-   fu_cv_sys_stat_fs_data=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 11407 "configure"
-+#line 11323 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -11424,7 +11340,7 @@
- exit (statfs (".", &fsd) != 1);
- }
- EOF
--if { (eval echo configure:11428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11344: \"$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
-@@ -11447,13 +11363,13 @@
- fi
- 
- echo $ac_n "checking if __FUNCTION__ is defined""... $ac_c" 1>&6
--echo "configure:11451: checking if __FUNCTION__ is defined" >&5
-+echo "configure:11367: 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 11457 "configure"
-+#line 11373 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -11462,7 +11378,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_HAVE_CPP_UNDERBAR_FUNCTION_DEFINED=yes
- else
-@@ -11491,7 +11407,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for sigaction.sa_sigaction""... $ac_c" 1>&6
--echo "configure:11495: checking for sigaction.sa_sigaction" >&5
-+echo "configure:11411: checking for sigaction.sa_sigaction" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11504,7 +11420,7 @@
-   defineit="no"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 11508 "configure"
-+#line 11424 "configure"
- #include "confdefs.h"
- 
- 
-@@ -11522,7 +11438,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -11556,7 +11472,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for sockaddr.sa_len""... $ac_c" 1>&6
--echo "configure:11560: checking for sockaddr.sa_len" >&5
-+echo "configure:11476: checking for sockaddr.sa_len" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11569,7 +11485,7 @@
-   defineit="no"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 11573 "configure"
-+#line 11489 "configure"
- #include "confdefs.h"
- 
- 
-@@ -11591,7 +11507,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -11625,7 +11541,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for sockaddr.sa_union.sa_generic.sa_family2""... $ac_c" 1>&6
--echo "configure:11629: checking for sockaddr.sa_union.sa_generic.sa_family2" >&5
-+echo "configure:11545: checking for sockaddr.sa_union.sa_generic.sa_family2" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -11638,7 +11554,7 @@
-   defineit="no"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 11642 "configure"
-+#line 11558 "configure"
- #include "confdefs.h"
- 
- 
-@@ -11660,7 +11576,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -11694,7 +11610,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:11698: checking for rtentry.rt_dst" >&5
-+echo "configure:11614: 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
-@@ -11707,7 +11623,7 @@
-   defineit="no"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 11711 "configure"
-+#line 11627 "configure"
- #include "confdefs.h"
- 
- 
-@@ -11715,11 +11631,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -11730,7 +11642,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -11757,25 +11669,21 @@
- 
- 
- echo $ac_n "checking type of rtentry structure""... $ac_c" 1>&6
--echo "configure:11761: checking type of rtentry structure" >&5
-+echo "configure:11673: 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 11768 "configure"
-+#line 11680 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- int main() {
-@@ -11791,7 +11699,7 @@
-   
- ; return 0; }
- EOF
--if { (eval echo configure:11795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_RTENTRY_TYPE="BSD-4.4"
- else
-@@ -11802,18 +11710,14 @@
- 
- if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
- cat > conftest.$ac_ext <<EOF
--#line 11806 "configure"
-+#line 11714 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- int main() {
-@@ -11823,7 +11727,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_RTENTRY_TYPE="BSD-4.3"
- else
-@@ -11852,12 +11756,12 @@
- 
- if test "x$ac_cv_RTENTRY_TYPE" = "xunknown"; then
- echo $ac_n "checking for struct rtentry""... $ac_c" 1>&6
--echo "configure:11856: checking for struct rtentry" >&5
-+echo "configure:11760: 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 11861 "configure"
-+#line 11765 "configure"
- #include "confdefs.h"
- #define KERNEL
- #include <net/route.h>
-@@ -11901,24 +11805,20 @@
- 
- 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:11905: checking for struct rtentry has a rt_next node" >&5
-+echo "configure:11809: 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 11911 "configure"
-+#line 11815 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- int main() {
-@@ -11928,7 +11828,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:11932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_struct_rtentry_rt_next=yes
- else
-@@ -11960,7 +11860,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:11964: checking for rtentry.rt_unit" >&5
-+echo "configure:11864: 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
-@@ -11973,7 +11873,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 11977 "configure"
-+#line 11877 "configure"
- #include "confdefs.h"
- 
- 
-@@ -11981,11 +11881,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -11996,7 +11892,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12030,7 +11926,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:12034: checking for rtentry.rt_refcnt" >&5
-+echo "configure:11930: 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
-@@ -12043,7 +11939,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12047 "configure"
-+#line 11943 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12051,11 +11947,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -12066,7 +11958,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12100,7 +11992,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:12104: checking for rtentry.rt_hash" >&5
-+echo "configure:11996: 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
-@@ -12113,7 +12005,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12117 "configure"
-+#line 12009 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12121,11 +12013,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -12136,7 +12024,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12170,7 +12058,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:12174: checking for rtentry.rt_use" >&5
-+echo "configure:12062: 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
-@@ -12183,7 +12071,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12187 "configure"
-+#line 12075 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12191,11 +12079,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -12206,7 +12090,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12240,7 +12124,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:12244: checking for tcpstat.tcp_rcvmemdrop" >&5
-+echo "configure:12128: 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
-@@ -12253,7 +12137,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12257 "configure"
-+#line 12141 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12278,7 +12162,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12313,7 +12197,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:12317: checking for ifnet.if_mtu" >&5
-+echo "configure:12201: 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
-@@ -12326,7 +12210,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12330 "configure"
-+#line 12214 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12348,7 +12232,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12376,7 +12260,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:12380: checking if _KERNEL needs to be defined for if_mtu" >&5
-+echo "configure:12264: 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
-@@ -12385,7 +12269,7 @@
-   ac_cv_IFNET_NEEDS_KERNEL=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 12389 "configure"
-+#line 12273 "configure"
- #include "confdefs.h"
- 
- #define _KERNEL 1
-@@ -12409,7 +12293,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_IFNET_NEEDS_KERNEL=yes
- else
-@@ -12441,7 +12325,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:12445: checking for ifaddr.ifa_next" >&5
-+echo "configure:12329: 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
-@@ -12454,7 +12338,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12458 "configure"
-+#line 12342 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12482,7 +12366,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12517,7 +12401,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:12521: checking for ifnet.if_baudrate" >&5
-+echo "configure:12405: 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
-@@ -12530,7 +12414,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12534 "configure"
-+#line 12418 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12589,7 +12473,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12624,7 +12508,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.ifs_value""... $ac_c" 1>&6
--echo "configure:12628: checking for ifnet.if_baudrate.ifs_value" >&5
-+echo "configure:12512: checking for ifnet.if_baudrate.ifs_value" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12637,7 +12521,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12641 "configure"
-+#line 12525 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12696,7 +12580,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12731,7 +12615,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:12735: checking for ifnet.if_speed" >&5
-+echo "configure:12619: 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
-@@ -12744,7 +12628,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12748 "configure"
-+#line 12632 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12803,7 +12687,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12838,7 +12722,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:12842: checking for ifnet.if_type" >&5
-+echo "configure:12726: 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
-@@ -12851,7 +12735,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12855 "configure"
-+#line 12739 "configure"
- #include "confdefs.h"
- 
- 
-@@ -12910,7 +12794,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:12914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -12945,7 +12829,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:12949: checking for ifnet.if_imcasts" >&5
-+echo "configure:12833: 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
-@@ -12958,7 +12842,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 12962 "configure"
-+#line 12846 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13017,7 +12901,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13052,7 +12936,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:13056: checking for ifnet.if_iqdrops" >&5
-+echo "configure:12940: 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
-@@ -13065,7 +12949,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13069 "configure"
-+#line 12953 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13124,7 +13008,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13159,7 +13043,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:13163: checking for ifnet.if_noproto" >&5
-+echo "configure:13047: 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
-@@ -13172,7 +13056,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13176 "configure"
-+#line 13060 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13231,7 +13115,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13266,7 +13150,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:13270: checking for ifnet.if_omcasts" >&5
-+echo "configure:13154: 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
-@@ -13279,7 +13163,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13283 "configure"
-+#line 13167 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13338,7 +13222,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13373,7 +13257,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:13377: checking for ifnet.if_xname" >&5
-+echo "configure:13261: 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
-@@ -13386,7 +13270,7 @@
-   defineit="no"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13390 "configure"
-+#line 13274 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13445,7 +13329,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13480,7 +13364,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:13484: checking for ifnet.if_lastchange.tv_sec" >&5
-+echo "configure:13368: 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
-@@ -13493,7 +13377,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13497 "configure"
-+#line 13381 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13552,7 +13436,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13587,7 +13471,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:13591: checking for ifnet.if_obytes" >&5
-+echo "configure:13475: 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
-@@ -13600,7 +13484,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13604 "configure"
-+#line 13488 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13659,7 +13543,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13694,7 +13578,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:13698: checking for ifnet.if_ibytes" >&5
-+echo "configure:13582: 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
-@@ -13707,7 +13591,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13711 "configure"
-+#line 13595 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13766,7 +13650,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13801,7 +13685,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:13805: checking for ifnet.if_addrlist" >&5
-+echo "configure:13689: 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
-@@ -13814,7 +13698,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13818 "configure"
-+#line 13702 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13873,7 +13757,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -13908,7 +13792,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:13912: checking for ifnet.if_addrhead.tqh_first" >&5
-+echo "configure:13796: 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
-@@ -13921,7 +13805,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 13925 "configure"
-+#line 13809 "configure"
- #include "confdefs.h"
- 
- 
-@@ -13980,7 +13864,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:13984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14015,7 +13899,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:14019: checking for udpstat.udps_discard" >&5
-+echo "configure:13903: 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
-@@ -14028,7 +13912,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14032 "configure"
-+#line 13916 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14056,7 +13940,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:13944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14090,7 +13974,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for udpstat.udps_noport""... $ac_c" 1>&6
--echo "configure:14094: checking for udpstat.udps_noport" >&5
-+echo "configure:13978: checking for udpstat.udps_noport" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -14103,7 +13987,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14107 "configure"
-+#line 13991 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14131,7 +14015,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14165,7 +14049,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for udpstat.udps_noportbcast""... $ac_c" 1>&6
--echo "configure:14169: checking for udpstat.udps_noportbcast" >&5
-+echo "configure:14053: checking for udpstat.udps_noportbcast" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -14178,7 +14062,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14182 "configure"
-+#line 14066 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14206,7 +14090,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14240,7 +14124,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for udpstat.udps_fullsock""... $ac_c" 1>&6
--echo "configure:14244: checking for udpstat.udps_fullsock" >&5
-+echo "configure:14128: checking for udpstat.udps_fullsock" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -14253,7 +14137,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14257 "configure"
-+#line 14141 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14281,7 +14165,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14315,7 +14199,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:14319: checking for arphd.at_next" >&5
-+echo "configure:14203: 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
-@@ -14328,7 +14212,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14332 "configure"
-+#line 14216 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14356,7 +14240,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14390,7 +14274,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:14394: checking for swdevt.sw_nblksenabled" >&5
-+echo "configure:14278: 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
-@@ -14403,7 +14287,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14407 "configure"
-+#line 14291 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14419,7 +14303,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14453,7 +14337,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:14457: checking for statvfs.f_frsize" >&5
-+echo "configure:14341: 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
-@@ -14466,7 +14350,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14470 "configure"
-+#line 14354 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14488,7 +14372,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14522,7 +14406,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for statvfs.f_files""... $ac_c" 1>&6
--echo "configure:14526: checking for statvfs.f_files" >&5
-+echo "configure:14410: checking for statvfs.f_files" >&5
- if eval "test \"`echo '$''{'$ac_safe_all'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -14535,7 +14419,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14539 "configure"
-+#line 14423 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14557,7 +14441,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14591,7 +14475,7 @@
-   ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- 
- echo $ac_n "checking for nlist.n_value""... $ac_c" 1>&6
--echo "configure:14595: checking for nlist.n_value" >&5
-+echo "configure:14479: 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
-@@ -14604,7 +14488,7 @@
-   defineit=""
- fi
- cat > conftest.$ac_ext <<EOF
--#line 14608 "configure"
-+#line 14492 "configure"
- #include "confdefs.h"
- 
- 
-@@ -14620,7 +14504,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:14624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:14508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "${ac_safe_all}=yes"
- else
-@@ -14651,7 +14535,7 @@
-   echo "configure: warning: Can't check sysctl, manually define CAN_USE_SYSCTL if platform support available" 1>&2
- else
-   echo $ac_n "checking if sysctl can read kernel information""... $ac_c" 1>&6
--echo "configure:14655: checking if sysctl can read kernel information" >&5
-+echo "configure:14539: 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
-@@ -14659,7 +14543,7 @@
-   ac_cv_CAN_USE_SYSCTL=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 14663 "configure"
-+#line 14547 "configure"
- #include "confdefs.h"
- 
- #if TIME_WITH_SYS_TIME
-@@ -14697,7 +14581,7 @@
- }
-   
- EOF
--if { (eval echo configure:14701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14585: \"$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
-@@ -14722,12 +14606,12 @@
- fi
- 
- echo $ac_n "checking whether TCP timers depend on \`hz'""... $ac_c" 1>&6
--echo "configure:14726: checking whether TCP timers depend on \`hz'" >&5
-+echo "configure:14610: checking whether TCP timers depend on \`hz'" >&5
- if eval "test \"`echo '$''{'ac_cv_TCPTV_NEEDS_HZ'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 14731 "configure"
-+#line 14615 "configure"
- #include "confdefs.h"
- #include <netinet/tcp_timer.h>
- TCPTV_SRTTDFLT
-@@ -14757,7 +14641,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:14761: checking if you have run configure before" >&5
-+echo "configure:14645: 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
-@@ -14812,7 +14696,7 @@
- 
- System Contact Information" | tail -1`
- echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
--echo "configure:14816: checking $MSG_CHECK" >&5
-+echo "configure:14700: 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
-@@ -14872,7 +14756,7 @@
- 
- System Location" | tail -1`
- echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
--echo "configure:14876: checking $MSG_CHECK" >&5
-+echo "configure:14760: 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
-@@ -14938,7 +14822,7 @@
- 
- Location to write logfile" | tail -1`
- echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
--echo "configure:14942: checking $MSG_CHECK" >&5
-+echo "configure:14826: 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
-@@ -15003,7 +14887,7 @@
- 
- Location to write persistent information" | tail -1`
- echo $ac_n "checking $MSG_CHECK""... $ac_c" 1>&6
--echo "configure:15007: checking $MSG_CHECK" >&5
-+echo "configure:14891: 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