diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 9142127499fc..cc26cb1243e4 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ar_io.c,v 1.40 2004/05/11 17:12:26 christos Exp $	*/
+/*	$NetBSD: ar_io.c,v 1.41 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ar_io.c,v 1.40 2004/05/11 17:12:26 christos Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.41 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -855,8 +855,12 @@ ar_write(char *buf, int bsz)
 		/*
 		 * if file is out of space, handle it like a return of 0
 		 */
-		if ((errno == ENOSPC) || (errno == EFBIG) || (errno == EDQUOT))
+		if ((errno == ENOSPC) || (errno == EFBIG))
 			res = lstrval = 0;
+#ifdef EDQUOT
+		if (errno == EDQUOT)
+			res = lstrval = 0;
+#endif
 		break;
 	case ISTAPE:
 	case ISCHR:
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index a43ccd182202..26700b084734 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file_subs.c,v 1.46 2004/05/03 02:22:54 christos Exp $	*/
+/*	$NetBSD: file_subs.c,v 1.47 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: file_subs.c,v 1.46 2004/05/03 02:22:54 christos Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.47 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -731,7 +731,7 @@ set_ftime(char *fnm, time_t mtime, time_t atime, int frc)
 		 * set. We get the current values of the times if we need them.
 		 */
 		if (lstat(fnm, &sb) == 0) {
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 			if (!patime)
 				TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atimespec);
 			if (!pmtime)
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 3b8f31de4d7a..4342a4f1e5df 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftree.c,v 1.30 2004/06/19 02:27:00 christos Exp $	*/
+/*	$NetBSD: ftree.c,v 1.31 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ftree.c,v 1.30 2004/06/19 02:27:00 christos Exp $");
+__RCSID("$NetBSD: ftree.c,v 1.31 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -522,7 +522,7 @@ next_file(ARCHD *arcn)
 			statbuf.st_flags = ftnode->st_flags;
 #endif
 		if (ftnode->flags & F_TIME)
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 			statbuf.st_mtimespec = ftnode->st_mtimespec;
 #else
 			statbuf.st_mtime = ftnode->st_mtimespec.tv_sec;
@@ -726,6 +726,7 @@ next_file(ARCHD *arcn)
 			arcn->ln_name[cnt] = '\0';
 			arcn->ln_nlen = cnt;
 			break;
+#ifdef S_IFSOCK
 		case S_IFSOCK:
 			/*
 			 * under BSD storing a socket is senseless but we will
@@ -734,6 +735,7 @@ next_file(ARCHD *arcn)
 			 */
 			arcn->type = PAX_SCK;
 			break;
+#endif
 		case S_IFIFO:
 			arcn->type = PAX_FIF;
 			break;
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index e92927733b0e..921ebd6cd7f0 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $	*/
+/*	$NetBSD: getoldopt.c,v 1.20 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*
  * Plug-compatible replacement for getopt() for parsing tar-like
@@ -15,10 +15,14 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $");
+__RCSID("$NetBSD: getoldopt.c,v 1.20 2004/06/20 22:20:14 jmc Exp $");
 #endif /* not lint */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index 5e50785fa53a..f11970582e02 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.76 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.76 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,11 @@ __RCSID("$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $");
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 2d7f96dd364d..e9284b906313 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pax.c,v 1.34 2004/05/11 17:12:26 christos Exp $	*/
+/*	$NetBSD: pax.c,v 1.35 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 #if 0
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: pax.c,v 1.34 2004/05/11 17:12:26 christos Exp $");
+__RCSID("$NetBSD: pax.c,v 1.35 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -337,9 +337,11 @@ sig_cleanup(int which_sig)
 	 * will clearly see the message on a line by itself.
 	 */
 	vflag = vfpart = 1;
+#ifdef SIGXCPU
 	if (which_sig == SIGXCPU)
 		tty_warn(0, "CPU time limit reached, cleaning up.");
 	else
+#endif
 		tty_warn(0, "Signal caught, cleaning up.");
 
 	/* delete any open temporary file */
@@ -416,11 +418,23 @@ gen_init(void)
 	 */
 	if ((sigemptyset(&s_mask) < 0) || (sigaddset(&s_mask, SIGTERM) < 0) ||
 	    (sigaddset(&s_mask,SIGINT) < 0)||(sigaddset(&s_mask,SIGHUP) < 0) ||
-	    (sigaddset(&s_mask,SIGPIPE) < 0)||(sigaddset(&s_mask,SIGQUIT)<0) ||
-	    (sigaddset(&s_mask,SIGXCPU) < 0)||(sigaddset(&s_mask,SIGXFSZ)<0)) {
+	    (sigaddset(&s_mask,SIGPIPE) < 0)||(sigaddset(&s_mask,SIGQUIT)<0)){
 		tty_warn(1, "Unable to set up signal mask");
 		return(-1);
 	}
+#ifdef SIGXCPU
+	if (sigaddset(&s_mask,SIGXCPU) < 0) {
+		tty_warn(1, "Unable to set up signal mask");
+		return(-1);
+	}
+#endif
+#ifdef SIGXFSZ
+	if (sigaddset(&s_mask,SIGXFSZ) < 0) {
+		tty_warn(1, "Unable to set up signal mask");
+		return(-1);
+	}
+#endif
+
 	memset(&n_hand, 0, sizeof n_hand);
 	n_hand.sa_mask = s_mask;
 	n_hand.sa_flags = 0;
@@ -446,15 +460,19 @@ gen_init(void)
 	    (sigaction(SIGQUIT, &o_hand, &o_hand) < 0))
 		goto out;
 
+#ifdef SIGXCPU
 	if ((sigaction(SIGXCPU, &n_hand, &o_hand) < 0) &&
 	    (o_hand.sa_handler == SIG_IGN) &&
 	    (sigaction(SIGXCPU, &o_hand, &o_hand) < 0))
 		goto out;
-
+#endif
 	n_hand.sa_handler = SIG_IGN;
-	if ((sigaction(SIGPIPE, &n_hand, &o_hand) < 0) ||
-	    (sigaction(SIGXFSZ, &n_hand, &o_hand) < 0))
+	if (sigaction(SIGPIPE, &n_hand, &o_hand) < 0)
 		goto out;
+#ifdef SIGXFSZ
+	if (sigaction(SIGXFSZ, &n_hand, &o_hand) < 0)
+		goto out;
+#endif
 	return(0);
 
     out:
diff --git a/include/getopt.h b/include/getopt.h
index 46398d0718fd..54ce73021426 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt.h,v 1.5 2003/04/28 23:16:13 bjh21 Exp $	*/
+/*	$NetBSD: getopt.h,v 1.6 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
 /*
  * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
  */
-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define no_argument        0
 #define required_argument  1
 #define optional_argument  2
@@ -64,7 +64,9 @@ struct option {
 	/* if flag not NULL, value to set *flag to; else return value */
 	int val;
 };
+#endif
 
+#if defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int getopt_long __P((int, char * const *, const char *,
     const struct option *, int *));
diff --git a/include/glob.h b/include/glob.h
index cde42ef6f1e4..eb2c164a68c5 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.h,v 1.17 2003/08/07 09:44:10 agc Exp $	*/
+/*	$NetBSD: glob.h,v 1.18 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -81,7 +81,7 @@ typedef struct {
 #define	GLOB_NOMATCH	(-3)	/* No match, and GLOB_NOCHECK was not set. */
 #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */
 
-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
diff --git a/include/pwd.h b/include/pwd.h
index a3d720e11cc8..3cce0524142d 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwd.h,v 1.32 2003/10/13 15:36:33 agc Exp $	*/
+/*	$NetBSD: pwd.h,v 1.33 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -68,7 +68,7 @@
 #include <sys/featuretest.h>
 #include <sys/types.h>
 
-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define	_PATH_PASSWD		"/etc/passwd"
 #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
 #define	_PATH_MASTERPASSWD_LOCK	"/etc/ptmp"
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 80a5ea3c24aa..395e011149ca 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $	*/
+/*	$NetBSD: bt_conv.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_conv.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
index f9290cb562c2..23b489a4f771 100644
--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $	*/
+/*	$NetBSD: bt_debug.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_debug.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
index 53bef9acbd04..0d8ab1f75e3f 100644
--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $	*/
+/*	$NetBSD: bt_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #else
-__RCSID("$NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $");
+__RCSID("$NetBSD: bt_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 76f03d2dacf1..1dac3c7c41e1 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash_bigkey.c,v 1.17 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_bigkey.c,v 1.18 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #else
-__RCSID("$NetBSD: hash_bigkey.c,v 1.17 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_bigkey.c,v 1.18 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 8d4f054652b6..ecad70f634e5 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_buf.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #else
-__RCSID("$NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_buf.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index 512c200633d8..3ce7653a97c7 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_func.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_func.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
index 5d0892cc6ac5..8c494f5f45de 100644
--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_log2.c,v 1.9 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
 #else
-__RCSID("$NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_log2.c,v 1.9 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
index a61b2ebf36f5..8a7527d2e483 100644
--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $	*/
+/*	$NetBSD: rec_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #else
-__RCSID("$NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $");
+__RCSID("$NetBSD: rec_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/gen/__fts13.c b/lib/libc/gen/__fts13.c
index f87d730064f0..beb10c0e3092 100644
--- a/lib/libc/gen/__fts13.c
+++ b/lib/libc/gen/__fts13.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $	*/
+/*	$NetBSD: __fts13.c,v 1.43 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #else
-__RCSID("$NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.43 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index fa7073849379..157010a84ccd 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwcache.c,v 1.28 2004/06/18 20:34:58 thorpej Exp $	*/
+/*	$NetBSD: pwcache.c,v 1.29 2004/06/20 22:20:14 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pwcache.c,v 1.28 2004/06/18 20:34:58 thorpej Exp $");
+__RCSID("$NetBSD: pwcache.c,v 1.29 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -111,7 +111,7 @@ __weak_alias(pwcache_userdb,_pwcache_userdb)
 __weak_alias(pwcache_groupdb,_pwcache_groupdb)
 #endif
 
-#if !HAVE_PWCACHE_USERDB
+#if !HAVE_PWCACHE_USERDB || HAVE_NBTOOL_CONFIG_H
 #include "pwcache.h"
 
 /*
diff --git a/lib/libc/stdio/fparseln.c b/lib/libc/stdio/fparseln.c
index 9373d78c34dd..af28131e1c25 100644
--- a/lib/libc/stdio/fparseln.c
+++ b/lib/libc/stdio/fparseln.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fparseln.c,v 1.4 2004/05/11 17:31:04 drochner Exp $	*/
+/*	$NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.4 2004/05/11 17:31:04 drochner Exp $");
+__RCSID("$NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -56,7 +56,7 @@ __weak_alias(fparseln,_fparseln)
 #define FUNLOCKFILE(fp)
 #endif
 
-#ifdef _REENTRANT
+#if defined(_REENTRANT) && !HAVE_NBTOOL_CONFIG_H
 #define __fgetln(f, l) __fgetstr(f, l, '\n')
 #else
 #define __fgetln(f, l) fgetln(f, l)
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 201ec142a802..4956ddc2cb1c 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.17 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,9 +36,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.17 2004/06/20 22:20:15 jmc Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -46,7 +50,11 @@ __RCSID("$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index 1aa7e4be764f..9bf1dadfb804 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: strmode.c,v 1.15 2003/08/07 16:43:51 agc Exp $	*/
+/*	$NetBSD: strmode.c,v 1.16 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
 #else
-__RCSID("$NetBSD: strmode.c,v 1.15 2003/08/07 16:43:51 agc Exp $");
+__RCSID("$NetBSD: strmode.c,v 1.16 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -80,9 +80,11 @@ strmode(mode, p)
 	case S_IFLNK:			/* symbolic link */
 		*p++ = 'l';
 		break;
+#ifdef S_IFSOCK
 	case S_IFSOCK:			/* socket */
 		*p++ = 's';
 		break;
+#endif
 #ifdef S_IFIFO
 	case S_IFIFO:			/* fifo */
 		*p++ = 'p';
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index f6fa41386f04..205abe402211 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mknod.c,v 1.33 2004/06/17 23:15:07 christos Exp $	*/
+/*	$NetBSD: mknod.c,v 1.34 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -43,13 +43,13 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1998 The NetBSD Foundation, Inc.  All rights reserved.\n");
-__RCSID("$NetBSD: mknod.c,v 1.33 2004/06/17 23:15:07 christos Exp $");
+__RCSID("$NetBSD: mknod.c,v 1.34 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#ifdef __NetBSD__
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/sysctl.h>
 #endif
 
diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk
index db5b210dfc65..89fa8b555731 100644
--- a/share/mk/bsd.hostprog.mk
+++ b/share/mk/bsd.hostprog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.43 2004/06/10 00:29:58 lukem Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.44 2004/06/20 22:20:15 jmc Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
@@ -112,3 +112,21 @@ lint: ${LOBJS}
 .include <bsd.dep.mk>
 
 ${TARGETS}:	# ensure existence
+
+# Override YACC/LEX rules so nbtool_config.h can be forced as the 1st include
+.l.c:
+	${_MKTARGET_LEX}
+	${LEX.l} -o${.TARGET} ${.IMPSRC}
+	echo '#if HAVE_NBTOOL_CONFIG_H' > ${.TARGET}.1
+	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
+	echo '#endif' >> ${.TARGET}.1
+	cat ${.TARGET} >> ${.TARGET}.1
+	mv ${.TARGET}.1 ${.TARGET}
+.y.c:
+	${_MKTARGET_YACC}
+	${YACC.y} -o ${.TARGET} ${.IMPSRC}
+	echo '#if HAVE_NBTOOL_CONFIG_H' > ${.TARGET}.1
+	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
+	echo '#endif' >> ${.TARGET}.1
+	cat ${.TARGET} >> ${.TARGET}.1
+	mv ${.TARGET}.1 ${.TARGET}
diff --git a/tools/compat/Makefile b/tools/compat/Makefile
index ec6ea23c2fa7..8d9753e93c31 100644
--- a/tools/compat/Makefile
+++ b/tools/compat/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2004/06/18 20:26:51 thorpej Exp $
+#	$NetBSD: Makefile,v 1.31 2004/06/20 22:20:15 jmc Exp $
 
 HOSTLIB=	nbcompat
 
@@ -23,11 +23,8 @@ CPPFLAGS+=	-no-cpp-precomp
 # -D_FILE_OFFSET_BITS=64 produces a much more amenable `struct stat', and
 # other file ops, on many systems, without changing function names.
 
-# -D_NETBSD_SOURCE is necessary for some of the NetBSD headers that we
-# also use on the host system.
-
 CPPFLAGS+=	-I. -I./include -I${.CURDIR} -DHAVE_NBTOOL_CONFIG_H=1 \
-		-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
+		-D_FILE_OFFSET_BITS=64
 
 .PATH:		${.CURDIR}/../../lib/libc/gen \
 		${.CURDIR}/../../lib/libc/hash \
diff --git a/tools/compat/compat_defs.h b/tools/compat/compat_defs.h
index 0d01c907bfbd..bd28caede070 100644
--- a/tools/compat/compat_defs.h
+++ b/tools/compat/compat_defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_defs.h,v 1.38 2004/06/18 20:24:03 thorpej Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.39 2004/06/20 22:20:15 jmc Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
@@ -15,16 +15,25 @@
 #include <features.h>
 #endif
 
+/* So _NETBSD_SOURCE doesn't end up defined. Define enough to pull in standard
+   defs. Other platforms may need similiar defines. */
+#ifdef __NetBSD__
+#define _POSIX_SOURCE	1
+#define _POSIX_C_SOURCE	200112L
+#define _XOPEN_SOURCE 600
+#else
 #undef _POSIX_SOURCE
 #undef _POSIX_C_SOURCE
+#endif
 
 /* System headers needed for (re)definitions below. */
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
-#include <sys/stat.h>
+/* time.h needs to be pulled in first at least on netbsd w/o _NETBSD_SOURCE */
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -32,19 +41,7 @@
 #include <paths.h>
 #include <stdarg.h>
 #include <stdio.h>
-
-/* So extra NetBSD extentions don't get pulled in */
-#ifdef __NetBSD__
-#define _POSIX_C_SOURCE
-#undef _NETBSD_SOURCE
-#endif
-
 #include <stdlib.h>
-
-#ifdef __NetBSD__
-#undef _POSIX_C_SOURCE
-#endif
-
 #include <string.h>
 
 #if HAVE_SYS_CDEFS_H
@@ -137,6 +134,18 @@ typedef int socklen_t;
 typedef unsigned long u_long;
 #endif
 
+#if !HAVE_U_CHAR
+typedef unsigned char u_char;
+#endif
+
+#if !HAVE_U_INT
+typedef unsigned int u_int;
+#endif
+
+#if !HAVE_U_SHORT
+typedef unsigned short u_short;
+#endif
+
 /* Prototypes for replacement functions. */
 
 #if !HAVE_ATOLL
@@ -169,9 +178,26 @@ char *dirname(char *);
 #if HAVE_DIR_DD_FD
 #define dirfd(dirp) ((dirp)->dd_fd)
 #else
+/*XXX: Very hacky but no other way to bring this into scope w/o defining
+  _NETBSD_SOURCE which we're avoiding. */
+#ifdef __NetBSD__
+struct _dirdesc {
+        int     dd_fd;          /* file descriptor associated with directory */
+	long    dd_loc;         /* offset in current buffer */
+	long    dd_size;        /* amount of data returned by getdents */
+	char    *dd_buf;        /* data buffer */
+	int     dd_len;         /* size of data buffer */
+	off_t   dd_seek;        /* magic cookie returned by getdents */
+	long    dd_rewind;      /* magic cookie for rewinding */
+	int     dd_flags;       /* flags for readdir */
+	void    *dd_lock;       /* lock for concurrent access */
+};
+#define dirfd(dirp)     (((struct _dirdesc *)dirp)->dd_fd)
+#else
 #error cannot figure out how to turn a DIR * into a fd
 #endif
 #endif
+#endif
 
 #if !HAVE_ERR_H
 void err(int, const char *, ...);
@@ -180,7 +206,7 @@ void warn(const char *, ...);
 void warnx(const char *, ...);
 #endif
 
-#if !HAVE_FGETLN
+#if !HAVE_FGETLN || defined(__NetBSD__)
 char *fgetln(FILE *, size_t *);
 #endif
 
@@ -192,7 +218,7 @@ char *fgetln(FILE *, size_t *);
 int flock(int, int);
 #endif
 
-#if !HAVE_FPARSELN
+#if !HAVE_FPARSELN || defined(__NetBSD__)
 # define FPARSELN_UNESCESC	0x01
 # define FPARSELN_UNESCCONT	0x02
 # define FPARSELN_UNESCCOMM	0x04
@@ -221,16 +247,33 @@ int lchmod(const char *, mode_t);
 int lchown(const char *, uid_t, gid_t);
 #endif
 
-#if !HAVE_MACHINE_BSWAP_H
-#define bswap16(x)	((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff))
+#define __nbcompat_bswap16(x)	((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff))
 
-#define bswap32(x)	((((x) << 24) & 0xff000000) | \
-			 (((x) <<  8) & 0x00ff0000) | \
-			 (((x) >>  8) & 0x0000ff00) | \
-			 (((x) >> 24) & 0x000000ff))
+#define __nbcompat_bswap32(x)	((((x) << 24) & 0xff000000) | \
+				 (((x) <<  8) & 0x00ff0000) | \
+				 (((x) >>  8) & 0x0000ff00) | \
+				 (((x) >> 24) & 0x000000ff))
 
-#define bswap64(x)	(((u_int64_t)bswap32((x)) << 32) | \
-			 ((u_int64_t)bswap32((x) >> 32)))
+#define __nbcompat_bswap64(x)	(((u_int64_t)bswap32((x)) << 32) | \
+				 ((u_int64_t)bswap32((x) >> 32)))
+
+#if !HAVE_BSWAP16
+#ifdef bswap16
+#undef bswap16
+#endif
+#define bswap16(x)	__nbcompat_bswap16(x)
+#endif
+#if !HAVE_BSWAP32
+#ifdef bswap32
+#undef bswap32
+#endif
+#define bswap32(x)	__nbcompat_bswap32(x)
+#endif
+#if !HAVE_BSWAP64
+#ifdef bswap64
+#undef bswap64
+#endif
+#define bswap64(x)	__nbcompat_bswap64(x)
 #endif
 
 #if !HAVE_MKSTEMP
@@ -257,15 +300,11 @@ int pwcache_userdb(int (*)(int), void (*)(void),
 int gid_from_group(const char *, gid_t *);
 int pwcache_groupdb(int (*)(int), void (*)(void),
 		struct group * (*)(const char *), struct group * (*)(gid_t));
-# if HAVE_USER_FROM_UID
+#endif
 /* Make them use our version */
 #  define user_from_uid __nbcompat_user_from_uid
-# endif
-# if HAVE_GROUP_FROM_GID
 /* Make them use our version */
 #  define group_from_gid __nbcompat_group_from_gid
-# endif
-#endif
 
 #if !HAVE_PWRITE
 ssize_t pwrite(int, const void *, size_t, off_t);
@@ -283,7 +322,7 @@ int setgroupent(int);
 int setpassent(int);
 #endif
 
-#if !HAVE_SETPROGNAME
+#if !HAVE_SETPROGNAME || defined(__NetBSD__)
 const char *getprogname(void);
 void setprogname(const char *);
 #endif
@@ -300,7 +339,7 @@ size_t strlcat(char *, const char *, size_t);
 size_t strlcpy(char *, const char *, size_t);
 #endif
 
-#if !HAVE_STRSEP
+#if !HAVE_STRSEP || defined(__NetBSD__)
 char *strsep(char **, const char *);
 #endif
 
@@ -486,29 +525,61 @@ int	 cgetustr(char *, const char *, char **);
 
 /* <sys/endian.h> */
 
-#ifdef HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#else
 #if WORDS_BIGENDIAN
+#if !HAVE_HTOBE16
 #define htobe16(x)	(x)
+#endif
+#if !HAVE_HTOBE32
 #define htobe32(x)	(x)
+#endif
+#if !HAVE_HTOBE64
 #define htobe64(x)	(x)
+#endif
+#if !HAVE_HTOLE16
 #define htole16(x)	bswap16((u_int16_t)(x))
+#endif
+#if !HAVE_HTOLE32
 #define htole32(x)	bswap32((u_int32_t)(x))
+#endif
+#if !HAVE_HTOLE64
 #define htole64(x)	bswap64((u_int64_t)(x))
+#endif
 #else
+#if !HAVE_HTOBE16
 #define htobe16(x)	bswap16((u_int16_t)(x))
+#endif
+#if !HAVE_HTOBE32
 #define htobe32(x)	bswap32((u_int32_t)(x))
+#endif
+#if !HAVE_HTOBE64
 #define htobe64(x)	bswap64((u_int64_t)(x))
+#endif
+#if !HAVE_HTOLE16
 #define htole16(x)	(x)
+#endif
+#if !HAVE_HTOLE32
 #define htole32(x)	(x)
+#endif
+#if !HAVE_HTOLE64
 #define htole64(x)	(x)
 #endif
+#endif
+#if !HAVE_BE16TOH
 #define be16toh(x)	htobe16(x)
+#endif
+#if !HAVE_BE32TOH
 #define be32toh(x)	htobe32(x)
+#endif
+#if !HAVE_BE64TOH
 #define be64toh(x)	htobe64(x)
+#endif
+#if !HAVE_LE16TOH
 #define le16toh(x)	htole16(x)
+#endif
+#if !HAVE_LE32TOH
 #define le32toh(x)	htole32(x)
+#endif
+#if !HAVE_LE64TOH
 #define le64toh(x)	htole64(x)
 #endif
 
@@ -594,6 +665,19 @@ int	 cgetustr(char *, const char *, char **);
 #endif
 #endif
 
+/* Protected by _NETBSD_SOURCE otherwise. */
+#if HAVE_STRUCT_STAT_ST_FLAGS && defined(__NetBSD__)
+#define UF_SETTABLE     0x0000ffff
+#define UF_NODUMP       0x00000001
+#define UF_IMMUTABLE    0x00000002
+#define UF_APPEND       0x00000004
+#define UF_OPAQUE       0x00000008
+#define SF_SETTABLE     0xffff0000
+#define SF_ARCHIVED     0x00010000
+#define SF_IMMUTABLE    0x00020000
+#define SF_APPEND       0x00040000
+#endif
+
 /* <sys/syslimits.h> */
 
 #ifndef LINE_MAX
@@ -633,6 +717,26 @@ int	 cgetustr(char *, const char *, char **);
 
 /* <sys/types.h> */
 
+#ifdef major
+#undef major
+#endif
+#define major(x)        ((int32_t)((((x) & 0x000fff00) >>  8)))
+
+#ifdef minor
+#undef minor
+#endif
+#define minor(x)        ((int32_t)((((x) & 0xfff00000) >> 12) | \
+                                   (((x) & 0x000000ff) >>  0)))
+#ifdef makedev
+#undef makedev
+#endif
+#define makedev(x,y)    ((dev_t)((((x) <<  8) & 0x000fff00) | \
+			(((y) << 12) & 0xfff00000) | \
+			(((y) <<  0) & 0x000000ff)))
+#ifndef NBBY
+#define NBBY 8
+#endif
+
 #if !HAVE_U_QUAD_T
 /* #define, not typedef, as quad_t exists as a struct on some systems */
 #define quad_t long long
diff --git a/tools/compat/compat_getopt.h b/tools/compat/compat_getopt.h
new file mode 100644
index 000000000000..fd803019589c
--- /dev/null
+++ b/tools/compat/compat_getopt.h
@@ -0,0 +1,13 @@
+/*      $NetBSD: compat_getopt.h,v 1.1 2004/06/20 22:20:15 jmc Exp $ */
+
+/* We unconditionally use the NetBSD getopt.h in libnbcompat. */
+
+#if HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#define option __nbcompat_option
+#ifdef _GETOPT_H_
+#undef _GETOPT_H_
+#endif
+#include "../../include/getopt.h"
diff --git a/tools/compat/configure b/tools/compat/configure
index a8169e29e281..26ceb595571f 100755
--- a/tools/compat/configure
+++ b/tools/compat/configure
@@ -964,51 +964,7 @@ ac_config_headers="$ac_config_headers nbtool_config.h"
 
 ac_config_files="$ac_config_files defs.mk"
 
-# Extract the first word of "sh", so it can be a program name with args.
-set dummy sh; ac_word=$2
-echo "$as_me:969: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_BSHELL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $BSHELL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BSHELL="$BSHELL" # Let the user override the test with a path.
-  ;;
-  *)
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_BSHELL="$ac_dir/$ac_word"
-   echo "$as_me:986: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
-  ;;
-esac
-fi
-BSHELL=$ac_cv_path_BSHELL
-
-if test -n "$BSHELL"; then
-  echo "$as_me:997: result: $BSHELL" >&5
-echo "${ECHO_T}$BSHELL" >&6
-else
-  echo "$as_me:1000: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test x"$BSHELL" = x; then
-	{ { echo "$as_me:1005: error: sh must be somewhere on \$PATH" >&5
-echo "$as_me: error: sh must be somewhere on \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-cat >>confdefs.h <<EOF
-#define PATH_BSHELL "$BSHELL"
-EOF
+# AC_NETBSD
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1018,7 +974,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1021: checking for $ac_word" >&5
+echo "$as_me:977: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1033,7 +989,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1036: found $ac_dir/$ac_word" >&5
+echo "$as_me:992: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1041,10 +997,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1044: result: $CC" >&5
+  echo "$as_me:1000: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1047: result: no" >&5
+  echo "$as_me:1003: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1053,7 +1009,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1056: checking for $ac_word" >&5
+echo "$as_me:1012: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1068,7 +1024,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1071: found $ac_dir/$ac_word" >&5
+echo "$as_me:1027: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1076,10 +1032,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1079: result: $ac_ct_CC" >&5
+  echo "$as_me:1035: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1082: result: no" >&5
+  echo "$as_me:1038: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1092,7 +1048,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1095: checking for $ac_word" >&5
+echo "$as_me:1051: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1107,7 +1063,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1110: found $ac_dir/$ac_word" >&5
+echo "$as_me:1066: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1115,10 +1071,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1118: result: $CC" >&5
+  echo "$as_me:1074: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1121: result: no" >&5
+  echo "$as_me:1077: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1127,7 +1083,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1130: checking for $ac_word" >&5
+echo "$as_me:1086: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1142,7 +1098,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1145: found $ac_dir/$ac_word" >&5
+echo "$as_me:1101: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1150,10 +1106,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1153: result: $ac_ct_CC" >&5
+  echo "$as_me:1109: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1156: result: no" >&5
+  echo "$as_me:1112: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1166,7 +1122,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1169: checking for $ac_word" >&5
+echo "$as_me:1125: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1186,7 +1142,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1189: found $ac_dir/$ac_word" >&5
+echo "$as_me:1145: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1208,10 +1164,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1211: result: $CC" >&5
+  echo "$as_me:1167: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1214: result: no" >&5
+  echo "$as_me:1170: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1222,7 +1178,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1225: checking for $ac_word" >&5
+echo "$as_me:1181: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1237,7 +1193,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1240: found $ac_dir/$ac_word" >&5
+echo "$as_me:1196: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1245,10 +1201,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1248: result: $CC" >&5
+  echo "$as_me:1204: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1251: result: no" >&5
+  echo "$as_me:1207: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1261,7 +1217,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1264: checking for $ac_word" >&5
+echo "$as_me:1220: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1276,7 +1232,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1279: found $ac_dir/$ac_word" >&5
+echo "$as_me:1235: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1284,10 +1240,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1287: result: $ac_ct_CC" >&5
+  echo "$as_me:1243: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1290: result: no" >&5
+  echo "$as_me:1246: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1299,32 +1255,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1302: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1258: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1307:" \
+echo "$as_me:1263:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1310: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1266: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1313: \$? = $ac_status" >&5
+  echo "$as_me:1269: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1315: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1271: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1318: \$? = $ac_status" >&5
+  echo "$as_me:1274: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1320: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1276: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1323: \$? = $ac_status" >&5
+  echo "$as_me:1279: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1327 "configure"
+#line 1283 "configure"
 #include "confdefs.h"
 
 int
@@ -1340,13 +1296,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1343: checking for C compiler default output" >&5
+echo "$as_me:1299: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1346: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1302: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1349: \$? = $ac_status" >&5
+  echo "$as_me:1305: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1369,34 +1325,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1372: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1328: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1378: result: $ac_file" >&5
+echo "$as_me:1334: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1383: checking whether the C compiler works" >&5
+echo "$as_me:1339: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1392: \$? = $ac_status" >&5
+  echo "$as_me:1348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1399: error: cannot run C compiled programs.
+	{ { echo "$as_me:1355: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1404,24 +1360,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1407: result: yes" >&5
+echo "$as_me:1363: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1414: checking whether we are cross compiling" >&5
+echo "$as_me:1370: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1416: result: $cross_compiling" >&5
+echo "$as_me:1372: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1419: checking for executable suffix" >&5
+echo "$as_me:1375: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1424: \$? = $ac_status" >&5
+  echo "$as_me:1380: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1437,25 +1393,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1440: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1396: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1446: result: $ac_cv_exeext" >&5
+echo "$as_me:1402: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1452: checking for object suffix" >&5
+echo "$as_me:1408: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1458 "configure"
+#line 1414 "configure"
 #include "confdefs.h"
 
 int
@@ -1467,10 +1423,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1473: \$? = $ac_status" >&5
+  echo "$as_me:1429: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1482,24 +1438,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1485: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1441: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1492: result: $ac_cv_objext" >&5
+echo "$as_me:1448: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1496: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1452: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1502 "configure"
+#line 1458 "configure"
 #include "confdefs.h"
 
 int
@@ -1514,16 +1470,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1520: \$? = $ac_status" >&5
+  echo "$as_me:1476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1526: \$? = $ac_status" >&5
+  echo "$as_me:1482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1535,19 +1491,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1538: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1494: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1544: checking whether $CC accepts -g" >&5
+echo "$as_me:1500: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1550 "configure"
+#line 1506 "configure"
 #include "confdefs.h"
 
 int
@@ -1559,16 +1515,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1565: \$? = $ac_status" >&5
+  echo "$as_me:1521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1571: \$? = $ac_status" >&5
+  echo "$as_me:1527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1578,7 +1534,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1581: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1537: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1605,16 +1561,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1611: \$? = $ac_status" >&5
+  echo "$as_me:1567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1617: \$? = $ac_status" >&5
+  echo "$as_me:1573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1626,7 +1582,7 @@ if { (eval echo "$as_me:1608: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1629 "configure"
+#line 1585 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1639,16 +1595,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1645: \$? = $ac_status" >&5
+  echo "$as_me:1601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1651: \$? = $ac_status" >&5
+  echo "$as_me:1607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1658,7 +1614,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1661 "configure"
+#line 1617 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1670,16 +1626,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1676: \$? = $ac_status" >&5
+  echo "$as_me:1632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1682: \$? = $ac_status" >&5
+  echo "$as_me:1638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1706,144 +1662,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:1709: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-#line 1717 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:1737: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1740: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:1743: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-#line 1747 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:1767: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:1773: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-  { { echo "$as_me:1789: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1794 "configure"
-#include "confdefs.h"
-int
-main ()
-{
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:1810: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:1813: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:1815: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:1818: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_bigendian=yes
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:1831: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-if test $ac_cv_c_bigendian = yes; then
-
-cat >>confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1846: checking how to run the C preprocessor" >&5
+echo "$as_me:1670: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1864,18 +1688,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1867 "configure"
+#line 1691 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1872: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1696: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1878: \$? = $ac_status" >&5
+  echo "$as_me:1702: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1898,17 +1722,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1901 "configure"
+#line 1725 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1905: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1911: \$? = $ac_status" >&5
+  echo "$as_me:1735: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1945,7 +1769,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:1948: result: $CPP" >&5
+echo "$as_me:1772: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -1955,18 +1779,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1958 "configure"
+#line 1782 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:1963: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1787: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1969: \$? = $ac_status" >&5
+  echo "$as_me:1793: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1989,17 +1813,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1992 "configure"
+#line 1816 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1996: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2002: \$? = $ac_status" >&5
+  echo "$as_me:1826: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2027,7 +1851,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2030: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:1854: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2038,13 +1862,221 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:2041: checking for ANSI C header files" >&5
+            echo "$as_me:1865: checking for NetBSD" >&5
+echo $ECHO_N "checking for NetBSD... $ECHO_C" >&6
+      cat >conftest.$ac_ext <<_ACEOF
+#line 1868 "configure"
+#include "confdefs.h"
+#ifdef __NetBSD__
+	yes
+	#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  echo "$as_me:1877: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	cat >>confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+ cat >>confdefs.h <<\EOF
+#define _POSIX_C_SOURCE 200112L
+EOF
+ cat >>confdefs.h <<\EOF
+#define _XOPEN_SOURCE 600
+EOF
+
+else
+  echo "$as_me:1890: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest*
+
+# Extract the first word of "sh", so it can be a program name with args.
+set dummy sh; ac_word=$2
+echo "$as_me:1897: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_BSHELL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $BSHELL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BSHELL="$BSHELL" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_BSHELL="$ac_dir/$ac_word"
+   echo "$as_me:1914: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  ;;
+esac
+fi
+BSHELL=$ac_cv_path_BSHELL
+
+if test -n "$BSHELL"; then
+  echo "$as_me:1925: result: $BSHELL" >&5
+echo "${ECHO_T}$BSHELL" >&6
+else
+  echo "$as_me:1928: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test x"$BSHELL" = x; then
+	{ { echo "$as_me:1933: error: sh must be somewhere on \$PATH" >&5
+echo "$as_me: error: sh must be somewhere on \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+cat >>confdefs.h <<EOF
+#define PATH_BSHELL "$BSHELL"
+EOF
+
+echo "$as_me:1941: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+if test "${ac_cv_c_bigendian+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+#line 1949 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+
+int
+main ()
+{
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1966: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1969: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1972: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1975: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
+#line 1979 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:1996: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:1999: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2002: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2005: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_c_bigendian=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+  { { echo "$as_me:2021: error: cannot run test program while cross compiling" >&5
+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2026 "configure"
+#include "confdefs.h"
+int
+main ()
+{
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:2042: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2045: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:2047: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2050: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_c_bigendian=yes
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:2063: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+if test $ac_cv_c_bigendian = yes; then
+
+cat >>confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+
+fi
+
+echo "$as_me:2073: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2047 "configure"
+#line 2079 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2052,13 +2084,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:2055: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2087: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2061: \$? = $ac_status" >&5
+  echo "$as_me:2093: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2080,7 +2112,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2083 "configure"
+#line 2115 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -2098,7 +2130,7 @@ fi
 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 <<_ACEOF
-#line 2101 "configure"
+#line 2133 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -2119,7 +2151,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2122 "configure"
+#line 2154 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -2145,15 +2177,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:2148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2151: \$? = $ac_status" >&5
+  echo "$as_me:2183: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:2153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2156: \$? = $ac_status" >&5
+  echo "$as_me:2188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2166,7 +2198,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:2169: result: $ac_cv_header_stdc" >&5
+echo "$as_me:2201: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -2179,23 +2211,23 @@ fi
 # Confirm existence of zlib.  (This is available as a default install
 # option on many OS's; this could be added as a reachover build in the
 # future.)
-echo "$as_me:2182: checking for zlib.h" >&5
+echo "$as_me:2214: checking for zlib.h" >&5
 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2188 "configure"
+#line 2220 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 _ACEOF
-if { (eval echo "$as_me:2192: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2198: \$? = $ac_status" >&5
+  echo "$as_me:2230: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2214,17 +2246,17 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2217: result: $ac_cv_header_zlib_h" >&5
+echo "$as_me:2249: result: $ac_cv_header_zlib_h" >&5
 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 if test $ac_cv_header_zlib_h = yes; then
   :
 else
-  { { echo "$as_me:2222: error: zlib must be installed in a compiler-visible path" >&5
+  { { echo "$as_me:2254: error: zlib must be installed in a compiler-visible path" >&5
 echo "$as_me: error: zlib must be installed in a compiler-visible path" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:2227: checking for gzdopen in -lz" >&5
+echo "$as_me:2259: checking for gzdopen in -lz" >&5
 echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_gzdopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2232,7 +2264,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2235 "configure"
+#line 2267 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2251,16 +2283,16 @@ gzdopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2286: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2257: \$? = $ac_status" >&5
+  echo "$as_me:2289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2263: \$? = $ac_status" >&5
+  echo "$as_me:2295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_z_gzdopen=yes
 else
@@ -2271,7 +2303,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2274: result: $ac_cv_lib_z_gzdopen" >&5
+echo "$as_me:2306: result: $ac_cv_lib_z_gzdopen" >&5
 echo "${ECHO_T}$ac_cv_lib_z_gzdopen" >&6
 if test $ac_cv_lib_z_gzdopen = yes; then
   cat >>confdefs.h <<EOF
@@ -2281,7 +2313,7 @@ EOF
   LIBS="-lz $LIBS"
 
 else
-  { { echo "$as_me:2284: error: zlib must be installed in a compiler-visible path" >&5
+  { { echo "$as_me:2316: error: zlib must be installed in a compiler-visible path" >&5
 echo "$as_me: error: zlib must be installed in a compiler-visible path" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2297,23 +2329,23 @@ for ac_header in sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
 	termios.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2300: checking for $ac_header" >&5
+echo "$as_me:2332: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2306 "configure"
+#line 2338 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2310: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2342: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2316: \$? = $ac_status" >&5
+  echo "$as_me:2348: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2332,7 +2364,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2335: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2367: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2340,7 +2372,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 EOF
 
 else
-  { { echo "$as_me:2343: error: standard system header file not found" >&5
+  { { echo "$as_me:2375: error: standard system header file not found" >&5
 echo "$as_me: error: standard system header file not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2351,13 +2383,13 @@ done
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:2354: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:2386: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2360 "configure"
+#line 2392 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2372,16 +2404,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2378: \$? = $ac_status" >&5
+  echo "$as_me:2410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2384: \$? = $ac_status" >&5
+  echo "$as_me:2416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -2391,7 +2423,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2394: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2426: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2404,7 +2436,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:2407: checking for opendir in -ldir" >&5
+  echo "$as_me:2439: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2412,7 +2444,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2415 "configure"
+#line 2447 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2431,16 +2463,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2437: \$? = $ac_status" >&5
+  echo "$as_me:2469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2443: \$? = $ac_status" >&5
+  echo "$as_me:2475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -2451,14 +2483,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2454: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:2486: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:2461: checking for opendir in -lx" >&5
+  echo "$as_me:2493: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2466,7 +2498,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2469 "configure"
+#line 2501 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2485,16 +2517,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2491: \$? = $ac_status" >&5
+  echo "$as_me:2523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2497: \$? = $ac_status" >&5
+  echo "$as_me:2529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -2505,7 +2537,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2508: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:2540: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -2514,26 +2546,26 @@ fi
 fi
 
 for ac_header in sys/sysmacros.h sys/syslimits.h \
-	features.h malloc.h sys/poll.h stddef.h
+	getopt.h features.h malloc.h sys/poll.h stddef.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2520: checking for $ac_header" >&5
+echo "$as_me:2552: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2526 "configure"
+#line 2558 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2530: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2562: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2536: \$? = $ac_status" >&5
+  echo "$as_me:2568: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2552,7 +2584,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2555: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2587: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2566,23 +2598,23 @@ for ac_header in machine/bswap.h sys/cdefs.h sys/endian.h sys/featuretest.h \
 	err.h inttypes.h libgen.h paths.h stdint.h util.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2569: checking for $ac_header" >&5
+echo "$as_me:2601: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2575 "configure"
+#line 2607 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2579: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2611: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2585: \$? = $ac_status" >&5
+  echo "$as_me:2617: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2601,7 +2633,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2604: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2636: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2613,26 +2645,26 @@ else
 fi
 done
 
-for ac_header in rpc/types.h getopt.h netconfig.h
+for ac_header in rpc/types.h netconfig.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2619: checking for $ac_header" >&5
+echo "$as_me:2651: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2625 "configure"
+#line 2657 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2629: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2661: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2635: \$? = $ac_status" >&5
+  echo "$as_me:2667: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2651,7 +2683,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2654: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2686: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2676,28 +2708,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2679: checking for $ac_header" >&5
+echo "$as_me:2711: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2685 "configure"
+#line 2717 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2694: \$? = $ac_status" >&5
+  echo "$as_me:2726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2700: \$? = $ac_status" >&5
+  echo "$as_me:2732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -2707,7 +2739,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2710: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2742: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2717,13 +2749,13 @@ EOF
 fi
 done
 
-echo "$as_me:2720: checking for size_t" >&5
+echo "$as_me:2752: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2726 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -2738,16 +2770,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2744: \$? = $ac_status" >&5
+  echo "$as_me:2776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2750: \$? = $ac_status" >&5
+  echo "$as_me:2782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -2757,7 +2789,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2760: result: $ac_cv_type_size_t" >&5
+echo "$as_me:2792: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -2769,13 +2801,13 @@ EOF
 
 fi
 
-echo "$as_me:2772: checking for id_t" >&5
+echo "$as_me:2804: checking for id_t" >&5
 echo $ECHO_N "checking for id_t... $ECHO_C" >&6
 if test "${ac_cv_type_id_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2778 "configure"
+#line 2810 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -2790,16 +2822,16 @@ if (sizeof (id_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2825: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2796: \$? = $ac_status" >&5
+  echo "$as_me:2828: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2802: \$? = $ac_status" >&5
+  echo "$as_me:2834: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_id_t=yes
 else
@@ -2809,7 +2841,7 @@ ac_cv_type_id_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2812: result: $ac_cv_type_id_t" >&5
+echo "$as_me:2844: result: $ac_cv_type_id_t" >&5
 echo "${ECHO_T}$ac_cv_type_id_t" >&6
 if test $ac_cv_type_id_t = yes; then
 
@@ -2818,13 +2850,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:2821: checking for long long" >&5
+echo "$as_me:2853: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2827 "configure"
+#line 2859 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -2839,16 +2871,16 @@ if (sizeof (long long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2845: \$? = $ac_status" >&5
+  echo "$as_me:2877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2851: \$? = $ac_status" >&5
+  echo "$as_me:2883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long_long=yes
 else
@@ -2858,7 +2890,7 @@ ac_cv_type_long_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2861: result: $ac_cv_type_long_long" >&5
+echo "$as_me:2893: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6
 if test $ac_cv_type_long_long = yes; then
 
@@ -2867,13 +2899,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:2870: checking for u_long" >&5
+echo "$as_me:2902: checking for u_long" >&5
 echo $ECHO_N "checking for u_long... $ECHO_C" >&6
 if test "${ac_cv_type_u_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2876 "configure"
+#line 2908 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -2888,16 +2920,16 @@ if (sizeof (u_long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2894: \$? = $ac_status" >&5
+  echo "$as_me:2926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2897: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2900: \$? = $ac_status" >&5
+  echo "$as_me:2932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_long=yes
 else
@@ -2907,7 +2939,7 @@ ac_cv_type_u_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2910: result: $ac_cv_type_u_long" >&5
+echo "$as_me:2942: result: $ac_cv_type_u_long" >&5
 echo "${ECHO_T}$ac_cv_type_u_long" >&6
 if test $ac_cv_type_u_long = yes; then
 
@@ -2916,13 +2948,160 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:2919: checking for u_quad_t" >&5
+echo "$as_me:2951: checking for u_char" >&5
+echo $ECHO_N "checking for u_char... $ECHO_C" >&6
+if test "${ac_cv_type_u_char+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2957 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+if ((u_char *) 0)
+  return 0;
+if (sizeof (u_char))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2972: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2975: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2978: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2981: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_u_char=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_u_char=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:2991: result: $ac_cv_type_u_char" >&5
+echo "${ECHO_T}$ac_cv_type_u_char" >&6
+if test $ac_cv_type_u_char = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_U_CHAR 1
+EOF
+
+fi
+echo "$as_me:3000: checking for u_short" >&5
+echo $ECHO_N "checking for u_short... $ECHO_C" >&6
+if test "${ac_cv_type_u_short+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3006 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+if ((u_short *) 0)
+  return 0;
+if (sizeof (u_short))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3021: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3024: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3027: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3030: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_u_short=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_u_short=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:3040: result: $ac_cv_type_u_short" >&5
+echo "${ECHO_T}$ac_cv_type_u_short" >&6
+if test $ac_cv_type_u_short = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_U_SHORT 1
+EOF
+
+fi
+echo "$as_me:3049: checking for u_int" >&5
+echo $ECHO_N "checking for u_int... $ECHO_C" >&6
+if test "${ac_cv_type_u_int+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3055 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+if ((u_int *) 0)
+  return 0;
+if (sizeof (u_int))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3070: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3073: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3076: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3079: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_u_int=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_u_int=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:3089: result: $ac_cv_type_u_int" >&5
+echo "${ECHO_T}$ac_cv_type_u_int" >&6
+if test $ac_cv_type_u_int = yes; then
+
+cat >>confdefs.h <<EOF
+#define HAVE_U_INT 1
+EOF
+
+fi
+echo "$as_me:3098: checking for u_quad_t" >&5
 echo $ECHO_N "checking for u_quad_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_quad_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2925 "configure"
+#line 3104 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -2937,16 +3116,16 @@ if (sizeof (u_quad_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2943: \$? = $ac_status" >&5
+  echo "$as_me:3122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2949: \$? = $ac_status" >&5
+  echo "$as_me:3128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_quad_t=yes
 else
@@ -2956,7 +3135,7 @@ ac_cv_type_u_quad_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2959: result: $ac_cv_type_u_quad_t" >&5
+echo "$as_me:3138: result: $ac_cv_type_u_quad_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_quad_t" >&6
 if test $ac_cv_type_u_quad_t = yes; then
 
@@ -2966,13 +3145,13 @@ EOF
 
 fi
 
-echo "$as_me:2969: checking for socklen_t" >&5
+echo "$as_me:3148: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2975 "configure"
+#line 3154 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -2989,16 +3168,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2995: \$? = $ac_status" >&5
+  echo "$as_me:3174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3001: \$? = $ac_status" >&5
+  echo "$as_me:3180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -3008,7 +3187,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3011: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:3190: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3017,13 +3196,13 @@ EOF
 
 fi
 
-	echo "$as_me:3020: checking for uint8_t" >&5
+	echo "$as_me:3199: checking for uint8_t" >&5
 echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint8_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3026 "configure"
+#line 3205 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3038,16 +3217,16 @@ if (sizeof (uint8_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3044: \$? = $ac_status" >&5
+  echo "$as_me:3223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3050: \$? = $ac_status" >&5
+  echo "$as_me:3229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint8_t=yes
 else
@@ -3057,19 +3236,19 @@ ac_cv_type_uint8_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3060: result: $ac_cv_type_uint8_t" >&5
+echo "$as_me:3239: result: $ac_cv_type_uint8_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
 if test $ac_cv_type_uint8_t = yes; then
   :
 else
 
-		echo "$as_me:3066: checking for u_int8_t" >&5
+		echo "$as_me:3245: checking for u_int8_t" >&5
 echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int8_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3072 "configure"
+#line 3251 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3084,16 +3263,16 @@ if (sizeof (u_int8_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3266: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3090: \$? = $ac_status" >&5
+  echo "$as_me:3269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3096: \$? = $ac_status" >&5
+  echo "$as_me:3275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int8_t=yes
 else
@@ -3103,7 +3282,7 @@ ac_cv_type_u_int8_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3106: result: $ac_cv_type_u_int8_t" >&5
+echo "$as_me:3285: result: $ac_cv_type_u_int8_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6
 if test $ac_cv_type_u_int8_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3111,20 +3290,20 @@ if test $ac_cv_type_u_int8_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3114: error: cannot find a suitable type for uint8_t" >&5
+  { { echo "$as_me:3293: error: cannot find a suitable type for uint8_t" >&5
 echo "$as_me: error: cannot find a suitable type for uint8_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3121: checking for u_int8_t" >&5
+	echo "$as_me:3300: checking for u_int8_t" >&5
 echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int8_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3127 "configure"
+#line 3306 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3139,16 +3318,16 @@ if (sizeof (u_int8_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3142: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3321: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3145: \$? = $ac_status" >&5
+  echo "$as_me:3324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3151: \$? = $ac_status" >&5
+  echo "$as_me:3330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int8_t=yes
 else
@@ -3158,19 +3337,19 @@ ac_cv_type_u_int8_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3161: result: $ac_cv_type_u_int8_t" >&5
+echo "$as_me:3340: result: $ac_cv_type_u_int8_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6
 if test $ac_cv_type_u_int8_t = yes; then
   :
 else
 
-		echo "$as_me:3167: checking for uint8_t" >&5
+		echo "$as_me:3346: checking for uint8_t" >&5
 echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint8_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3173 "configure"
+#line 3352 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3185,16 +3364,16 @@ if (sizeof (uint8_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3367: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3191: \$? = $ac_status" >&5
+  echo "$as_me:3370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3197: \$? = $ac_status" >&5
+  echo "$as_me:3376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint8_t=yes
 else
@@ -3204,7 +3383,7 @@ ac_cv_type_uint8_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3207: result: $ac_cv_type_uint8_t" >&5
+echo "$as_me:3386: result: $ac_cv_type_uint8_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
 if test $ac_cv_type_uint8_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3212,20 +3391,20 @@ if test $ac_cv_type_uint8_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3215: error: cannot find a suitable type for u_int8_t" >&5
+  { { echo "$as_me:3394: error: cannot find a suitable type for u_int8_t" >&5
 echo "$as_me: error: cannot find a suitable type for u_int8_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3222: checking for uint16_t" >&5
+	echo "$as_me:3401: checking for uint16_t" >&5
 echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3228 "configure"
+#line 3407 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3240,16 +3419,16 @@ if (sizeof (uint16_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3243: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3246: \$? = $ac_status" >&5
+  echo "$as_me:3425: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3252: \$? = $ac_status" >&5
+  echo "$as_me:3431: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint16_t=yes
 else
@@ -3259,19 +3438,19 @@ ac_cv_type_uint16_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3262: result: $ac_cv_type_uint16_t" >&5
+echo "$as_me:3441: result: $ac_cv_type_uint16_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
 if test $ac_cv_type_uint16_t = yes; then
   :
 else
 
-		echo "$as_me:3268: checking for u_int16_t" >&5
+		echo "$as_me:3447: checking for u_int16_t" >&5
 echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3274 "configure"
+#line 3453 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3286,16 +3465,16 @@ if (sizeof (u_int16_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3289: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3292: \$? = $ac_status" >&5
+  echo "$as_me:3471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3298: \$? = $ac_status" >&5
+  echo "$as_me:3477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int16_t=yes
 else
@@ -3305,7 +3484,7 @@ ac_cv_type_u_int16_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3308: result: $ac_cv_type_u_int16_t" >&5
+echo "$as_me:3487: result: $ac_cv_type_u_int16_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6
 if test $ac_cv_type_u_int16_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3313,20 +3492,20 @@ if test $ac_cv_type_u_int16_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3316: error: cannot find a suitable type for uint16_t" >&5
+  { { echo "$as_me:3495: error: cannot find a suitable type for uint16_t" >&5
 echo "$as_me: error: cannot find a suitable type for uint16_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3323: checking for u_int16_t" >&5
+	echo "$as_me:3502: checking for u_int16_t" >&5
 echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3329 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3341,16 +3520,16 @@ if (sizeof (u_int16_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3347: \$? = $ac_status" >&5
+  echo "$as_me:3526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3353: \$? = $ac_status" >&5
+  echo "$as_me:3532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int16_t=yes
 else
@@ -3360,19 +3539,19 @@ ac_cv_type_u_int16_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3363: result: $ac_cv_type_u_int16_t" >&5
+echo "$as_me:3542: result: $ac_cv_type_u_int16_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6
 if test $ac_cv_type_u_int16_t = yes; then
   :
 else
 
-		echo "$as_me:3369: checking for uint16_t" >&5
+		echo "$as_me:3548: checking for uint16_t" >&5
 echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3375 "configure"
+#line 3554 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3387,16 +3566,16 @@ if (sizeof (uint16_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3393: \$? = $ac_status" >&5
+  echo "$as_me:3572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3399: \$? = $ac_status" >&5
+  echo "$as_me:3578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint16_t=yes
 else
@@ -3406,7 +3585,7 @@ ac_cv_type_uint16_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3409: result: $ac_cv_type_uint16_t" >&5
+echo "$as_me:3588: result: $ac_cv_type_uint16_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
 if test $ac_cv_type_uint16_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3414,20 +3593,20 @@ if test $ac_cv_type_uint16_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3417: error: cannot find a suitable type for u_int16_t" >&5
+  { { echo "$as_me:3596: error: cannot find a suitable type for u_int16_t" >&5
 echo "$as_me: error: cannot find a suitable type for u_int16_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3424: checking for uint32_t" >&5
+	echo "$as_me:3603: checking for uint32_t" >&5
 echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3430 "configure"
+#line 3609 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3442,16 +3621,16 @@ if (sizeof (uint32_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3448: \$? = $ac_status" >&5
+  echo "$as_me:3627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3454: \$? = $ac_status" >&5
+  echo "$as_me:3633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint32_t=yes
 else
@@ -3461,19 +3640,19 @@ ac_cv_type_uint32_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3464: result: $ac_cv_type_uint32_t" >&5
+echo "$as_me:3643: result: $ac_cv_type_uint32_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
 if test $ac_cv_type_uint32_t = yes; then
   :
 else
 
-		echo "$as_me:3470: checking for u_int32_t" >&5
+		echo "$as_me:3649: checking for u_int32_t" >&5
 echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3476 "configure"
+#line 3655 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3488,16 +3667,16 @@ if (sizeof (u_int32_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3494: \$? = $ac_status" >&5
+  echo "$as_me:3673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3500: \$? = $ac_status" >&5
+  echo "$as_me:3679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int32_t=yes
 else
@@ -3507,7 +3686,7 @@ ac_cv_type_u_int32_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3510: result: $ac_cv_type_u_int32_t" >&5
+echo "$as_me:3689: result: $ac_cv_type_u_int32_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
 if test $ac_cv_type_u_int32_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3515,20 +3694,20 @@ if test $ac_cv_type_u_int32_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3518: error: cannot find a suitable type for uint32_t" >&5
+  { { echo "$as_me:3697: error: cannot find a suitable type for uint32_t" >&5
 echo "$as_me: error: cannot find a suitable type for uint32_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3525: checking for u_int32_t" >&5
+	echo "$as_me:3704: checking for u_int32_t" >&5
 echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3531 "configure"
+#line 3710 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3543,16 +3722,16 @@ if (sizeof (u_int32_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3549: \$? = $ac_status" >&5
+  echo "$as_me:3728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3555: \$? = $ac_status" >&5
+  echo "$as_me:3734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int32_t=yes
 else
@@ -3562,19 +3741,19 @@ ac_cv_type_u_int32_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3565: result: $ac_cv_type_u_int32_t" >&5
+echo "$as_me:3744: result: $ac_cv_type_u_int32_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
 if test $ac_cv_type_u_int32_t = yes; then
   :
 else
 
-		echo "$as_me:3571: checking for uint32_t" >&5
+		echo "$as_me:3750: checking for uint32_t" >&5
 echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3577 "configure"
+#line 3756 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3589,16 +3768,16 @@ if (sizeof (uint32_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3595: \$? = $ac_status" >&5
+  echo "$as_me:3774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3601: \$? = $ac_status" >&5
+  echo "$as_me:3780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint32_t=yes
 else
@@ -3608,7 +3787,7 @@ ac_cv_type_uint32_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3611: result: $ac_cv_type_uint32_t" >&5
+echo "$as_me:3790: result: $ac_cv_type_uint32_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
 if test $ac_cv_type_uint32_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3616,20 +3795,20 @@ if test $ac_cv_type_uint32_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3619: error: cannot find a suitable type for u_int32_t" >&5
+  { { echo "$as_me:3798: error: cannot find a suitable type for u_int32_t" >&5
 echo "$as_me: error: cannot find a suitable type for u_int32_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3626: checking for uint64_t" >&5
+	echo "$as_me:3805: checking for uint64_t" >&5
 echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3632 "configure"
+#line 3811 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3644,16 +3823,16 @@ if (sizeof (uint64_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3647: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3650: \$? = $ac_status" >&5
+  echo "$as_me:3829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3656: \$? = $ac_status" >&5
+  echo "$as_me:3835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint64_t=yes
 else
@@ -3663,19 +3842,19 @@ ac_cv_type_uint64_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3666: result: $ac_cv_type_uint64_t" >&5
+echo "$as_me:3845: result: $ac_cv_type_uint64_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
 if test $ac_cv_type_uint64_t = yes; then
   :
 else
 
-		echo "$as_me:3672: checking for u_int64_t" >&5
+		echo "$as_me:3851: checking for u_int64_t" >&5
 echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3678 "configure"
+#line 3857 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3690,16 +3869,16 @@ if (sizeof (u_int64_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3872: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3696: \$? = $ac_status" >&5
+  echo "$as_me:3875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3702: \$? = $ac_status" >&5
+  echo "$as_me:3881: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int64_t=yes
 else
@@ -3709,7 +3888,7 @@ ac_cv_type_u_int64_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3712: result: $ac_cv_type_u_int64_t" >&5
+echo "$as_me:3891: result: $ac_cv_type_u_int64_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6
 if test $ac_cv_type_u_int64_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3717,20 +3896,20 @@ if test $ac_cv_type_u_int64_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3720: error: cannot find a suitable type for uint64_t" >&5
+  { { echo "$as_me:3899: error: cannot find a suitable type for uint64_t" >&5
 echo "$as_me: error: cannot find a suitable type for uint64_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-	echo "$as_me:3727: checking for u_int64_t" >&5
+	echo "$as_me:3906: checking for u_int64_t" >&5
 echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3733 "configure"
+#line 3912 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3745,16 +3924,16 @@ if (sizeof (u_int64_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3751: \$? = $ac_status" >&5
+  echo "$as_me:3930: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3757: \$? = $ac_status" >&5
+  echo "$as_me:3936: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_u_int64_t=yes
 else
@@ -3764,19 +3943,19 @@ ac_cv_type_u_int64_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3767: result: $ac_cv_type_u_int64_t" >&5
+echo "$as_me:3946: result: $ac_cv_type_u_int64_t" >&5
 echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6
 if test $ac_cv_type_u_int64_t = yes; then
   :
 else
 
-		echo "$as_me:3773: checking for uint64_t" >&5
+		echo "$as_me:3952: checking for uint64_t" >&5
 echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3779 "configure"
+#line 3958 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -3791,16 +3970,16 @@ if (sizeof (uint64_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3797: \$? = $ac_status" >&5
+  echo "$as_me:3976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3803: \$? = $ac_status" >&5
+  echo "$as_me:3982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_uint64_t=yes
 else
@@ -3810,7 +3989,7 @@ ac_cv_type_uint64_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3813: result: $ac_cv_type_uint64_t" >&5
+echo "$as_me:3992: result: $ac_cv_type_uint64_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
 if test $ac_cv_type_uint64_t = yes; then
   cat >>confdefs.h <<\EOF
@@ -3818,7 +3997,7 @@ if test $ac_cv_type_uint64_t = yes; then
 EOF
 
 else
-  { { echo "$as_me:3821: error: cannot find a suitable type for u_int64_t" >&5
+  { { echo "$as_me:4000: error: cannot find a suitable type for u_int64_t" >&5
 echo "$as_me: error: cannot find a suitable type for u_int64_t" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3826,13 +4005,13 @@ fi
 fi
 
 # Struct members.
-echo "$as_me:3829: checking for DIR.dd_fd" >&5
+echo "$as_me:4008: checking for DIR.dd_fd" >&5
 echo $ECHO_N "checking for DIR.dd_fd... $ECHO_C" >&6
 if test "${ac_cv_member_DIR_dd_fd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3835 "configure"
+#line 4014 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <dirent.h>
@@ -3848,16 +4027,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3854: \$? = $ac_status" >&5
+  echo "$as_me:4033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3860: \$? = $ac_status" >&5
+  echo "$as_me:4039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_DIR_dd_fd=yes
 else
@@ -3867,7 +4046,7 @@ ac_cv_member_DIR_dd_fd=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3870: result: $ac_cv_member_DIR_dd_fd" >&5
+echo "$as_me:4049: result: $ac_cv_member_DIR_dd_fd" >&5
 echo "${ECHO_T}$ac_cv_member_DIR_dd_fd" >&6
 if test $ac_cv_member_DIR_dd_fd = yes; then
 
@@ -3876,13 +4055,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:3879: checking for struct dirent.d_namlen" >&5
+echo "$as_me:4058: checking for struct dirent.d_namlen" >&5
 echo $ECHO_N "checking for struct dirent.d_namlen... $ECHO_C" >&6
 if test "${ac_cv_member_struct_dirent_d_namlen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3885 "configure"
+#line 4064 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <dirent.h>
@@ -3898,16 +4077,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3904: \$? = $ac_status" >&5
+  echo "$as_me:4083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3910: \$? = $ac_status" >&5
+  echo "$as_me:4089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_dirent_d_namlen=yes
 else
@@ -3917,7 +4096,7 @@ ac_cv_member_struct_dirent_d_namlen=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3920: result: $ac_cv_member_struct_dirent_d_namlen" >&5
+echo "$as_me:4099: result: $ac_cv_member_struct_dirent_d_namlen" >&5
 echo "${ECHO_T}$ac_cv_member_struct_dirent_d_namlen" >&6
 if test $ac_cv_member_struct_dirent_d_namlen = yes; then
 
@@ -3927,13 +4106,13 @@ EOF
 
 fi
 
-echo "$as_me:3930: checking for struct stat.st_flags" >&5
+echo "$as_me:4109: checking for struct stat.st_flags" >&5
 echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3936 "configure"
+#line 4115 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 
@@ -3948,16 +4127,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3954: \$? = $ac_status" >&5
+  echo "$as_me:4133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3960: \$? = $ac_status" >&5
+  echo "$as_me:4139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_flags=yes
 else
@@ -3967,7 +4146,7 @@ ac_cv_member_struct_stat_st_flags=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3970: result: $ac_cv_member_struct_stat_st_flags" >&5
+echo "$as_me:4149: result: $ac_cv_member_struct_stat_st_flags" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6
 if test $ac_cv_member_struct_stat_st_flags = yes; then
 
@@ -3976,13 +4155,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:3979: checking for struct stat.st_gen" >&5
+echo "$as_me:4158: checking for struct stat.st_gen" >&5
 echo $ECHO_N "checking for struct stat.st_gen... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_gen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3985 "configure"
+#line 4164 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 
@@ -3997,16 +4176,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4003: \$? = $ac_status" >&5
+  echo "$as_me:4182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4009: \$? = $ac_status" >&5
+  echo "$as_me:4188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_gen=yes
 else
@@ -4016,7 +4195,7 @@ ac_cv_member_struct_stat_st_gen=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4019: result: $ac_cv_member_struct_stat_st_gen" >&5
+echo "$as_me:4198: result: $ac_cv_member_struct_stat_st_gen" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_gen" >&6
 if test $ac_cv_member_struct_stat_st_gen = yes; then
 
@@ -4025,13 +4204,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:4028: checking for struct stat.st_birthtime" >&5
+echo "$as_me:4207: checking for struct stat.st_birthtime" >&5
 echo $ECHO_N "checking for struct stat.st_birthtime... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4034 "configure"
+#line 4213 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 
@@ -4046,16 +4225,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4052: \$? = $ac_status" >&5
+  echo "$as_me:4231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4058: \$? = $ac_status" >&5
+  echo "$as_me:4237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_birthtime=yes
 else
@@ -4065,7 +4244,7 @@ ac_cv_member_struct_stat_st_birthtime=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4068: result: $ac_cv_member_struct_stat_st_birthtime" >&5
+echo "$as_me:4247: result: $ac_cv_member_struct_stat_st_birthtime" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_birthtime" >&6
 if test $ac_cv_member_struct_stat_st_birthtime = yes; then
 
@@ -4074,13 +4253,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:4077: checking for struct stat.st_atim" >&5
+echo "$as_me:4256: checking for struct stat.st_atim" >&5
 echo $ECHO_N "checking for struct stat.st_atim... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_atim+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4083 "configure"
+#line 4262 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 
@@ -4095,16 +4274,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4101: \$? = $ac_status" >&5
+  echo "$as_me:4280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4107: \$? = $ac_status" >&5
+  echo "$as_me:4286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_atim=yes
 else
@@ -4114,7 +4293,7 @@ ac_cv_member_struct_stat_st_atim=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4117: result: $ac_cv_member_struct_stat_st_atim" >&5
+echo "$as_me:4296: result: $ac_cv_member_struct_stat_st_atim" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_atim" >&6
 if test $ac_cv_member_struct_stat_st_atim = yes; then
 
@@ -4123,13 +4302,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 fi
-echo "$as_me:4126: checking for struct stat.st_mtimensec" >&5
+echo "$as_me:4305: checking for struct stat.st_mtimensec" >&5
 echo $ECHO_N "checking for struct stat.st_mtimensec... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4132 "configure"
+#line 4311 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 
@@ -4144,16 +4323,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4150: \$? = $ac_status" >&5
+  echo "$as_me:4329: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4156: \$? = $ac_status" >&5
+  echo "$as_me:4335: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_mtimensec=yes
 else
@@ -4163,7 +4342,7 @@ ac_cv_member_struct_stat_st_mtimensec=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4166: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
+echo "$as_me:4345: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtimensec" >&6
 if test $ac_cv_member_struct_stat_st_mtimensec = yes; then
 
@@ -4173,13 +4352,13 @@ EOF
 
 fi
 
-echo "$as_me:4176: checking for struct statfs.f_iosize" >&5
+echo "$as_me:4355: checking for struct statfs.f_iosize" >&5
 echo $ECHO_N "checking for struct statfs.f_iosize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_statfs_f_iosize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4182 "configure"
+#line 4361 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 
@@ -4194,16 +4373,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4200: \$? = $ac_status" >&5
+  echo "$as_me:4379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4206: \$? = $ac_status" >&5
+  echo "$as_me:4385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_statfs_f_iosize=yes
 else
@@ -4213,7 +4392,7 @@ ac_cv_member_struct_statfs_f_iosize=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4216: result: $ac_cv_member_struct_statfs_f_iosize" >&5
+echo "$as_me:4395: result: $ac_cv_member_struct_statfs_f_iosize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_statfs_f_iosize" >&6
 if test $ac_cv_member_struct_statfs_f_iosize = yes; then
 
@@ -4224,13 +4403,13 @@ EOF
 fi
 
 # Global variable decls.
-echo "$as_me:4227: checking whether optind is declared" >&5
+echo "$as_me:4406: checking whether optind is declared" >&5
 echo $ECHO_N "checking whether optind is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_optind+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4233 "configure"
+#line 4412 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4249,16 +4428,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4255: \$? = $ac_status" >&5
+  echo "$as_me:4434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4261: \$? = $ac_status" >&5
+  echo "$as_me:4440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_optind=yes
 else
@@ -4268,7 +4447,7 @@ ac_cv_have_decl_optind=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4271: result: $ac_cv_have_decl_optind" >&5
+echo "$as_me:4450: result: $ac_cv_have_decl_optind" >&5
 echo "${ECHO_T}$ac_cv_have_decl_optind" >&6
 if test $ac_cv_have_decl_optind = yes; then
 
@@ -4282,13 +4461,13 @@ else
 EOF
 
 fi
-echo "$as_me:4285: checking whether optreset is declared" >&5
+echo "$as_me:4464: checking whether optreset is declared" >&5
 echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_optreset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4291 "configure"
+#line 4470 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4307,16 +4486,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4313: \$? = $ac_status" >&5
+  echo "$as_me:4492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4319: \$? = $ac_status" >&5
+  echo "$as_me:4498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_optreset=yes
 else
@@ -4326,7 +4505,7 @@ ac_cv_have_decl_optreset=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4329: result: $ac_cv_have_decl_optreset" >&5
+echo "$as_me:4508: result: $ac_cv_have_decl_optreset" >&5
 echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6
 if test $ac_cv_have_decl_optreset = yes; then
 
@@ -4341,13 +4520,13 @@ EOF
 
 fi
 
-echo "$as_me:4344: checking whether sys_signame is declared" >&5
+echo "$as_me:4523: checking whether sys_signame is declared" >&5
 echo $ECHO_N "checking whether sys_signame is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_sys_signame+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4350 "configure"
+#line 4529 "configure"
 #include "confdefs.h"
 #include <signal.h>
 
@@ -4363,16 +4542,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4369: \$? = $ac_status" >&5
+  echo "$as_me:4548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4375: \$? = $ac_status" >&5
+  echo "$as_me:4554: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_sys_signame=yes
 else
@@ -4382,7 +4561,7 @@ ac_cv_have_decl_sys_signame=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4385: result: $ac_cv_have_decl_sys_signame" >&5
+echo "$as_me:4564: result: $ac_cv_have_decl_sys_signame" >&5
 echo "${ECHO_T}$ac_cv_have_decl_sys_signame" >&6
 if test $ac_cv_have_decl_sys_signame = yes; then
 
@@ -4400,13 +4579,13 @@ fi
 # Library functions (where a .h check isn't enough).
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:4403: checking for working alloca.h" >&5
+echo "$as_me:4582: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4409 "configure"
+#line 4588 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -4418,16 +4597,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4424: \$? = $ac_status" >&5
+  echo "$as_me:4603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4430: \$? = $ac_status" >&5
+  echo "$as_me:4609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -4437,7 +4616,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4440: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:4619: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -4447,13 +4626,13 @@ EOF
 
 fi
 
-echo "$as_me:4450: checking for alloca" >&5
+echo "$as_me:4629: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4456 "configure"
+#line 4635 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4485,16 +4664,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4491: \$? = $ac_status" >&5
+  echo "$as_me:4670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4497: \$? = $ac_status" >&5
+  echo "$as_me:4676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -4504,7 +4683,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4507: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:4686: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -4525,13 +4704,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:4528: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:4707: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4534 "configure"
+#line 4713 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4549,18 +4728,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4552: result: $ac_cv_os_cray" >&5
+echo "$as_me:4731: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4557: checking for $ac_func" >&5
+echo "$as_me:4736: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4563 "configure"
+#line 4742 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4591,16 +4770,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4597: \$? = $ac_status" >&5
+  echo "$as_me:4776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4603: \$? = $ac_status" >&5
+  echo "$as_me:4782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4610,7 +4789,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4613: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4792: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
 
@@ -4624,7 +4803,7 @@ fi
   done
 fi
 
-echo "$as_me:4627: checking stack direction for C alloca" >&5
+echo "$as_me:4806: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4633,7 +4812,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4636 "configure"
+#line 4815 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -4656,15 +4835,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4662: \$? = $ac_status" >&5
+  echo "$as_me:4841: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4667: \$? = $ac_status" >&5
+  echo "$as_me:4846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -4676,7 +4855,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:4679: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:4858: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -4694,13 +4873,13 @@ for ac_func in atoll asprintf asnprintf basename devname dirfd dirname \
 	user_from_uid vasprintf vasnprintf vsnprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4697: checking for $ac_func" >&5
+echo "$as_me:4876: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4703 "configure"
+#line 4882 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4731,16 +4910,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4737: \$? = $ac_status" >&5
+  echo "$as_me:4916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4743: \$? = $ac_status" >&5
+  echo "$as_me:4922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -4750,7 +4929,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4753: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4932: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -4760,13 +4939,151 @@ EOF
 fi
 done
 
-echo "$as_me:4763: checking whether setgroupent is declared" >&5
+for ac_func in htobe16, htobe32, htobe64, htole16, htole32, htole64, be16toh, be32toh, be64toh, le16toh, le32toh, le64toh
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:4945: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4951 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4982: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4985: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4988: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4991: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5001: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+for ac_func in bswap16, bswap32, bswap64
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:5014: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5020 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5054: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5060: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5070: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:5080: checking whether setgroupent is declared" >&5
 echo $ECHO_N "checking whether setgroupent is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_setgroupent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4769 "configure"
+#line 5086 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4785,16 +5102,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4791: \$? = $ac_status" >&5
+  echo "$as_me:5108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4797: \$? = $ac_status" >&5
+  echo "$as_me:5114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_setgroupent=yes
 else
@@ -4804,7 +5121,7 @@ ac_cv_have_decl_setgroupent=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4807: result: $ac_cv_have_decl_setgroupent" >&5
+echo "$as_me:5124: result: $ac_cv_have_decl_setgroupent" >&5
 echo "${ECHO_T}$ac_cv_have_decl_setgroupent" >&6
 if test $ac_cv_have_decl_setgroupent = yes; then
 
@@ -4818,13 +5135,13 @@ else
 EOF
 
 fi
-echo "$as_me:4821: checking whether setpassent is declared" >&5
+echo "$as_me:5138: checking whether setpassent is declared" >&5
 echo $ECHO_N "checking whether setpassent is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_setpassent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4827 "configure"
+#line 5144 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4843,16 +5160,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4849: \$? = $ac_status" >&5
+  echo "$as_me:5166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4855: \$? = $ac_status" >&5
+  echo "$as_me:5172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_have_decl_setpassent=yes
 else
@@ -4862,7 +5179,7 @@ ac_cv_have_decl_setpassent=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4865: result: $ac_cv_have_decl_setpassent" >&5
+echo "$as_me:5182: result: $ac_cv_have_decl_setpassent" >&5
 echo "${ECHO_T}$ac_cv_have_decl_setpassent" >&6
 if test $ac_cv_have_decl_setpassent = yes; then
 
@@ -4880,7 +5197,7 @@ fi
 # regcomp() and regexec() are also names of functions in the old V8
 # regexp package.  To avoid them, we need to find out who has regfree().
 
-echo "$as_me:4883: checking for regfree in -lregex" >&5
+echo "$as_me:5200: checking for regfree in -lregex" >&5
 echo $ECHO_N "checking for regfree in -lregex... $ECHO_C" >&6
 if test "${ac_cv_lib_regex_regfree+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4888,7 +5205,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lregex  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4891 "configure"
+#line 5208 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4907,16 +5224,16 @@ regfree ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4913: \$? = $ac_status" >&5
+  echo "$as_me:5230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4919: \$? = $ac_status" >&5
+  echo "$as_me:5236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_regex_regfree=yes
 else
@@ -4927,7 +5244,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4930: result: $ac_cv_lib_regex_regfree" >&5
+echo "$as_me:5247: result: $ac_cv_lib_regex_regfree" >&5
 echo "${ECHO_T}$ac_cv_lib_regex_regfree" >&6
 if test $ac_cv_lib_regex_regfree = yes; then
   cat >>confdefs.h <<EOF
@@ -4938,7 +5255,7 @@ EOF
 
 fi
 
-echo "$as_me:4941: checking for library containing regfree" >&5
+echo "$as_me:5258: checking for library containing regfree" >&5
 echo $ECHO_N "checking for library containing regfree... $ECHO_C" >&6
 if test "${ac_cv_search_regfree+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4946,7 +5263,7 @@ else
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_regfree=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 4949 "configure"
+#line 5266 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4965,16 +5282,16 @@ regfree ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4971: \$? = $ac_status" >&5
+  echo "$as_me:5288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4977: \$? = $ac_status" >&5
+  echo "$as_me:5294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_regfree="none required"
 else
@@ -4986,7 +5303,7 @@ if test "$ac_cv_search_regfree" = no; then
   for ac_lib in rx posix; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
-#line 4989 "configure"
+#line 5306 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5005,16 +5322,16 @@ regfree ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5011: \$? = $ac_status" >&5
+  echo "$as_me:5328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5017: \$? = $ac_status" >&5
+  echo "$as_me:5334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_search_regfree="-l$ac_lib"
 break
@@ -5027,7 +5344,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5030: result: $ac_cv_search_regfree" >&5
+echo "$as_me:5347: result: $ac_cv_search_regfree" >&5
 echo "${ECHO_T}$ac_cv_search_regfree" >&6
 if test "$ac_cv_search_regfree" != no; then
   test "$ac_cv_search_regfree" = "none required" || LIBS="$ac_cv_search_regfree $LIBS"
@@ -5113,7 +5430,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5116: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:5433: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -5285,7 +5602,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:5288: error: ambiguous option: $1
+    { { echo "$as_me:5605: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5304,7 +5621,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:5307: error: unrecognized option: $1
+  -*) { { echo "$as_me:5624: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5341,7 +5658,7 @@ do
   # Handling of arguments.
   "defs.mk" ) CONFIG_FILES="$CONFIG_FILES defs.mk" ;;
   "nbtool_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS nbtool_config.h" ;;
-  *) { { echo "$as_me:5344: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:5661: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5422,7 +5739,6 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
-s,@BSHELL@,$BSHELL,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -5431,6 +5747,7 @@ s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@CPP@,$CPP,;t t
+s,@BSHELL@,$BSHELL,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 CEOF
 
@@ -5541,7 +5858,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:5544: creating $ac_file" >&5
+    { echo "$as_me:5861: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -5559,7 +5876,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5562: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5879: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5572,7 +5889,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5575: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5892: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5632,7 +5949,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:5635: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:5952: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -5643,7 +5960,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5646: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5963: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5656,7 +5973,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5659: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5976: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5773,7 +6090,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:5776: $ac_file is unchanged" >&5
+      { echo "$as_me:6093: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/tools/compat/configure.ac b/tools/compat/configure.ac
index 42e0a9eddfd6..97ca8708da5e 100644
--- a/tools/compat/configure.ac
+++ b/tools/compat/configure.ac
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.43 2004/06/18 20:07:31 thorpej Exp $
+#	$NetBSD: configure.ac,v 1.44 2004/06/20 22:20:15 jmc Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -7,6 +7,21 @@ AC_INIT([libnbcompat], [noversion], [lib-bug-people@NetBSD.org])
 AC_CONFIG_HEADERS(nbtool_config.h)
 AC_CONFIG_FILES(defs.mk)
 
+AC_DEFUN([AC_NETBSD],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+      AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+      AC_MSG_CHECKING([for NetBSD])
+      AC_EGREP_CPP(yes,
+      [#ifdef __NetBSD__
+	yes
+	#endif
+	],
+	[AC_MSG_RESULT([yes])
+	AC_DEFINE(_POSIX_SOURCE, 1) AC_DEFINE(_POSIX_C_SOURCE, 200112L) AC_DEFINE(_XOPEN_SOURCE, 600)],
+	[AC_MSG_RESULT([no])])
+])# AC_NETBSD
+
+AC_NETBSD
 AC_PATH_PROG(BSHELL, sh, )
 if test x"$BSHELL" = x; then
 	AC_MSG_ERROR([sh must be somewhere on \$PATH])
@@ -37,11 +52,11 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
 # Find headers that may not be available.
 AC_HEADER_DIRENT
 AC_CHECK_HEADERS(sys/sysmacros.h sys/syslimits.h \
-	features.h malloc.h sys/poll.h stddef.h)
+	getopt.h features.h malloc.h sys/poll.h stddef.h)
 AC_CHECK_HEADERS(machine/bswap.h sys/cdefs.h sys/endian.h sys/featuretest.h \
 	err.h inttypes.h libgen.h paths.h stdint.h util.h,,
 	[test -f include/$ac_header || touch include/$ac_header])
-AC_CHECK_HEADERS(rpc/types.h getopt.h netconfig.h,,
+AC_CHECK_HEADERS(rpc/types.h netconfig.h,,
 	[echo '#include "nbtool_config.h"' >include/$ac_header.new
 	echo '#include "'$srcdir/../../include/$ac_header'"' >>include/$ac_header.new
 	if cmp include/$ac_header.new include/$ac_header >/dev/null 2>&1; then
@@ -52,7 +67,7 @@ AC_CHECK_HEADERS(rpc/types.h getopt.h netconfig.h,,
 
 # Typedefs.
 AC_TYPE_SIZE_T
-AC_CHECK_TYPES([id_t, long long, u_long, u_quad_t])
+AC_CHECK_TYPES([id_t, long long, u_long, u_char, u_short, u_int, u_quad_t])
 AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAVE_SOCKLEN_T)],,
 [#include <sys/types.h>
 #include <sys/socket.h>])
@@ -105,6 +120,14 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf basename devname dirfd dirname \
 	strsuftoll strtoll \
 	user_from_uid vasprintf vasnprintf vsnprintf)
 
+AC_CHECK_FUNCS([htobe16, htobe32, htobe64, htole16, htole32, htole64, be16toh, be32toh, be64toh, le16toh, le32toh, le64toh],,, [
+#include <sys/types.h>
+])
+
+AC_CHECK_FUNCS([bswap16, bswap32, bswap64],,, [
+#include <machine/bswap.h>
+])
+
 AC_CHECK_DECLS([setgroupent, setpassent],,, [
 #include <sys/types.h>
 #include <grp.h>
diff --git a/tools/compat/defs.mk.in b/tools/compat/defs.mk.in
index 7a42bf7c3303..3a2cb25afb32 100644
--- a/tools/compat/defs.mk.in
+++ b/tools/compat/defs.mk.in
@@ -1,4 +1,4 @@
-#	$NetBSD: defs.mk.in,v 1.8 2003/10/27 00:12:43 lukem Exp $
+#	$NetBSD: defs.mk.in,v 1.9 2004/06/20 22:20:15 jmc Exp $
 
 COMPATOBJ:=	${.PARSEDIR}
 HOSTEXEEXT=	@EXEEXT@
@@ -14,7 +14,7 @@ HOST_CPPFLAGS+=	-no-cpp-precomp
 
 HOST_CPPFLAGS+=	-I${COMPATOBJ} -I${COMPATOBJ}/include \
 		-I${.CURDIR}/../compat -DHAVE_NBTOOL_CONFIG_H=1 \
-		-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
+		-D_FILE_OFFSET_BITS=64
 
 DPADD+=		${COMPATOBJ}/libnbcompat.a
 LDADD+=		-L${COMPATOBJ} -lnbcompat @LIBS@
diff --git a/tools/compat/nbtool_config.h.in b/tools/compat/nbtool_config.h.in
index c81adf0d3390..7064bdf843f7 100644
--- a/tools/compat/nbtool_config.h.in
+++ b/tools/compat/nbtool_config.h.in
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbtool_config.h.in,v 1.3 2004/06/18 20:07:31 thorpej Exp $	*/
+/*	$NetBSD: nbtool_config.h.in,v 1.4 2004/06/20 22:20:15 jmc Exp $	*/
 
 #ifndef	__NETBSD_NBTOOL_CONFIG_H__
 #define	__NETBSD_NBTOOL_CONFIG_H__
@@ -11,6 +11,7 @@
 #undef HAVE_DIRENT_H
 #undef HAVE_ERR_H
 #undef HAVE_FEATURES_H
+#undef HAVE_GETOPT_H
 #undef HAVE_INTTYPES_H
 #undef HAVE_LIBGEN_H
 #undef HAVE_NDIR_H
@@ -34,8 +35,27 @@
 #undef HAVE_SOCKLEN_T
 #undef HAVE_LONG_LONG
 #undef HAVE_U_LONG
+#undef HAVE_U_CHAR
+#undef HAVE_U_INT
+#undef HAVE_U_SHORT
 #undef HAVE_U_QUAD_T
 
+#undef HAVE_BSWAP16
+#undef HAVE_BSWAP32
+#undef HAVE_BSWAP64
+#undef HAVE_HTOBE16
+#undef HAVE_HTOBE32
+#undef HAVE_HTOBE64
+#undef HAVE_HTOLE16
+#undef HAVE_HTOLE32
+#undef HAVE_HTOLE64
+#undef HAVE_BE16TOH
+#undef HAVE_BE32TOH
+#undef HAVE_BE64TOH
+#undef HAVE_LE16TOH
+#undef HAVE_LE32TOH
+#undef HAVE_LE64TOH
+
 #undef HAVE_DIR_DD_FD
 #undef HAVE_STRUCT_DIRENT_D_NAMLEN
 #undef HAVE_STRUCT_STAT_ST_FLAGS
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 578bca7f6c4b..0962275c621a 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: cksum.c,v 1.20 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -67,6 +67,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -77,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.20 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 7e73ad8527ae..980fa18cc89b 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.14 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: crc.c,v 1.15 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.14 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: crc.c,v 1.15 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cksum/md5.c b/usr.bin/cksum/md5.c
index c0f954f899be..183bf46b1274 100644
--- a/usr.bin/cksum/md5.c
+++ b/usr.bin/cksum/md5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md5.c,v 1.4 2002/03/31 14:43:22 bjh21 Exp $	*/
+/*	$NetBSD: md5.c,v 1.5 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * MDDRIVER.C - test driver for MD2, MD4 and MD5
@@ -17,9 +17,13 @@
  *  documentation and/or software.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: md5.c,v 1.4 2002/03/31 14:43:22 bjh21 Exp $");
+__RCSID("$NetBSD: md5.c,v 1.5 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index 0d435c369ffb..674b4cc98ca0 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: print.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: print.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index bd87b6f132a8..88429935ee54 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: sum1.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum1.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum1.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index d18424418d66..1b0f910dc5b1 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: sum2.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum2.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 426fd5c922ea..5f546ae97a34 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $	*/
+/*	$NetBSD: C.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: C.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 90dde76f42d8..d425f80962ae 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $	*/
+/*	$NetBSD: ctags.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -29,6 +29,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
@@ -39,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
 #if 0
 static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
-__RCSID("$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 335a0ba42a56..7065f182f2f0 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: fortran.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: fortran.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index fafe479c80b7..0faf450b9236 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: lisp.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: lisp.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index e1846faec0a7..173aed4367f2 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: print.c,v 1.8 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #else 
-__RCSID("$NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: print.c,v 1.8 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index f1cb32f41f5f..2e45fad74f94 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: tree.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: tree.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index d355d9fffb9e..23772cbe337d 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $	*/
+/*	$NetBSD: yacc.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $");
+__RCSID("$NetBSD: yacc.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 701ba752091e..a90b3a1e0972 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $	*/
+/*	$NetBSD: eval.c,v 1.18 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: eval.c,v 1.41 2001/10/10 23:25:31 espie Exp $	*/
 
 /*
@@ -33,12 +33,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $");
+__RCSID("$NetBSD: eval.c,v 1.18 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index e661d0f96b9a..0297eb25470c 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $	*/
+/*	$NetBSD: expr.c,v 1.16 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $	*/
 
 /*
@@ -33,12 +33,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)expr.c	8.2 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $");
+__RCSID("$NetBSD: expr.c,v 1.16 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 11be02d26e2d..a4e0e5d926e7 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gnum4.c,v 1.3 2004/04/23 02:58:29 simonb Exp $	*/
+/*	$NetBSD: gnum4.c,v 1.4 2004/06/20 22:20:15 jmc Exp $	*/
 /* $OpenBSD: gnum4.c,v 1.15 2001/10/13 20:18:48 espie Exp $ */
 
 /*
@@ -26,6 +26,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 /* 
  * functions needed to support gnu-m4 extensions, including a fake freezing
  */
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index 8d8bcfc726e1..1076b3bf2e84 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $	*/
+/*	$NetBSD: look.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: look.c,v 1.8 2001/09/17 08:11:13 espie Exp $	*/
 
 /*
@@ -33,12 +33,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)look.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $");
+__RCSID("$NetBSD: look.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index c38df97aa59a..dec054d8964e 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.35 2004/06/20 22:20:16 jmc Exp $	*/
 /*	$OpenBSD: main.c,v 1.51 2001/10/06 10:52:25 espie Exp $	*/
 
 /*-
@@ -33,6 +33,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -43,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.35 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 521254683980..550ff2686e6e 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $	*/
+/*	$NetBSD: misc.c,v 1.17 2004/06/20 22:20:16 jmc Exp $	*/
 /*	$OpenBSD: misc.c,v 1.25 2001/10/10 11:17:37 espie Exp $	*/
 
 /*
@@ -33,12 +33,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.17 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index eeb9b7d02957..755d0a827c19 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trace.c,v 1.4 2002/01/21 21:49:58 tv Exp $	*/
+/*	$NetBSD: trace.c,v 1.5 2004/06/20 22:20:16 jmc Exp $	*/
 /* $OpenBSD: trace.c,v 1.3 2001/09/29 15:47:18 espie Exp $ */
 
 /*
@@ -26,6 +26,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/usr.bin/menuc/avl.c b/usr.bin/menuc/avl.c
index 6a5d232c100b..8926dc23acde 100644
--- a/usr.bin/menuc/avl.c
+++ b/usr.bin/menuc/avl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: avl.c,v 1.5 2003/07/17 08:33:43 lukem Exp $	*/
+/*	$NetBSD: avl.c,v 1.6 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1997 Philip A. Nelson.
@@ -46,10 +46,14 @@
  *	} id_rec;
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: avl.c,v 1.5 2003/07/17 08:33:43 lukem Exp $");
+__RCSID("$NetBSD: avl.c,v 1.6 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/menuc/main.c b/usr.bin/menuc/main.c
index b6ad1fcb5b0a..b1e9d28df139 100644
--- a/usr.bin/menuc/main.c
+++ b/usr.bin/menuc/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* main.c - main program for menu compiler. */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/menuc/mdb.c b/usr.bin/menuc/mdb.c
index 78226c4c360e..20af3a3934a5 100644
--- a/usr.bin/menuc/mdb.c
+++ b/usr.bin/menuc/mdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $	*/
+/*	$NetBSD: mdb.c,v 1.40 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* mdb.c - menu database manipulation */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $");
+__RCSID("$NetBSD: mdb.c,v 1.40 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/menuc/util.c b/usr.bin/menuc/util.c
index a45eb6fd996c..3b63d8b65e3d 100644
--- a/usr.bin/menuc/util.c
+++ b/usr.bin/menuc/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.3 2003/07/17 08:33:44 lukem Exp $	*/
+/*	$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* util.c - utility routines. */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: util.c,v 1.3 2003/07/17 08:33:44 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/msgc/msgdb.c b/usr.bin/msgc/msgdb.c
index f2c9fe394df8..f548668c3e22 100644
--- a/usr.bin/msgc/msgdb.c
+++ b/usr.bin/msgc/msgdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $	*/
+/*	$NetBSD: msgdb.c,v 1.20 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* mdb.c - message database manipulation */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $");
+__RCSID("$NetBSD: msgdb.c,v 1.20 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/msgc/msgmain.c b/usr.bin/msgc/msgmain.c
index cb8cd1002a0a..80b972ba51c6 100644
--- a/usr.bin/msgc/msgmain.c
+++ b/usr.bin/msgc/msgmain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $	*/
+/*	$NetBSD: msgmain.c,v 1.7 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* main.c - main program */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $");
+__RCSID("$NetBSD: msgmain.c,v 1.7 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index 5523d8506c43..477a9dec0dbe 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $	*/
+/*	$NetBSD: rpc_clntout.c,v 1.13 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $");
+__RCSID("$NetBSD: rpc_clntout.c,v 1.13 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 99cb51a9bebe..71a64d9eab94 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_cout.c,v 1.25 2003/10/16 07:06:25 itojun Exp $	*/
+/*	$NetBSD: rpc_cout.c,v 1.26 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_cout.c,v 1.25 2003/10/16 07:06:25 itojun Exp $");
+__RCSID("$NetBSD: rpc_cout.c,v 1.26 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index bc703e374766..5c2ac31210b0 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $	*/
+/*	$NetBSD: rpc_hout.c,v 1.20 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $");
+__RCSID("$NetBSD: rpc_hout.c,v 1.20 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 644807dc4b45..3edb150e123d 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_main.c,v 1.25 2004/05/12 15:59:54 christos Exp $	*/
+/*	$NetBSD: rpc_main.c,v 1.26 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -30,12 +30,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_main.c,v 1.25 2004/05/12 15:59:54 christos Exp $");
+__RCSID("$NetBSD: rpc_main.c,v 1.26 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index 486cd0435f11..54412bb299ab 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $	*/
+/*	$NetBSD: rpc_parse.c,v 1.13 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $");
+__RCSID("$NetBSD: rpc_parse.c,v 1.13 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c
index 62fda18a8f77..6b1da836a9ff 100644
--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $	*/
+/*	$NetBSD: rpc_sample.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_sample.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index 66158d4ac8f1..d796b3efce0e 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $	*/
+/*	$NetBSD: rpc_scan.c,v 1.9 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_scan.c,v 1.9 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 8ba1e6822c14..84c856f32420 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_svcout.c,v 1.21 2003/09/26 22:25:21 wiz Exp $	*/
+/*	$NetBSD: rpc_svcout.c,v 1.22 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_svcout.c,v 1.21 2003/09/26 22:25:21 wiz Exp $");
+__RCSID("$NetBSD: rpc_svcout.c,v 1.22 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 58721c44eb90..84c547c8fcc7 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $	*/
+/*	$NetBSD: rpc_tblout.c,v 1.11 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #else
-__RCSID("$NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $");
+__RCSID("$NetBSD: rpc_tblout.c,v 1.11 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 08bedb7514c8..20aabec1f454 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $	*/
+/*	$NetBSD: rpc_util.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $");
+__RCSID("$NetBSD: rpc_util.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif
 
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index d6e6811063a1..4abc79bc8197 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stat.c,v 1.18 2004/05/28 04:48:31 atatat Exp $ */
+/*	$NetBSD: stat.c,v 1.19 2004/06/20 22:20:16 jmc Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: stat.c,v 1.18 2004/05/28 04:48:31 atatat Exp $");
+__RCSID("$NetBSD: stat.c,v 1.19 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #if ! HAVE_NBTOOL_CONFIG_H
@@ -706,8 +706,8 @@ format1(const struct stat *st,
 	case SHOW_st_btime:
 		if (!gottime) {
 			gottime = 1;
-			secs = st->st_birthtimespec.tv_sec;
-			nsecs = st->st_birthtimespec.tv_nsec;
+			secs = st->st_birthtime;
+			nsecs = st->st_birthtimensec;
 		}
 #endif /* HAVE_STRUCT_STAT_ST_BIRTHTIME */
 		small = (sizeof(secs) == 4);
@@ -802,7 +802,9 @@ format1(const struct stat *st,
 					(void)strcat(sdata, "*");
 				break;
 			case S_IFLNK:	(void)strcat(sdata, "@");	break;
+#ifdef S_IFSOCK
 			case S_IFSOCK:	(void)strcat(sdata, "=");	break;
+#endif
 #ifdef S_IFWHT
 			case S_IFWHT:	(void)strcat(sdata, "%");	break;
 #endif /* S_IFWHT */
@@ -820,7 +822,9 @@ format1(const struct stat *st,
 			case S_IFBLK:	sdata = "Block Device";		break;
 			case S_IFREG:	sdata = "Regular File";		break;
 			case S_IFLNK:	sdata = "Symbolic Link";	break;
+#ifdef S_IFSOCK
 			case S_IFSOCK:	sdata = "Socket";		break;
+#endif
 #ifdef S_IFWHT
 			case S_IFWHT:	sdata = "Whiteout File";	break;
 #endif /* S_IFWHT */
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 8650c7f25669..a6700427dd74 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: xinstall.c,v 1.86 2004/02/02 23:25:36 lukem Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.87 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.86 2004/02/02 23:25:36 lukem Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.87 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -578,7 +578,7 @@ install(char *from_name, char *to_name, u_int flags)
 			/* ensure that from_sb & tv are sane if !dolink */
 		if (stat(from_name, &from_sb))
 			err(1, "%s: stat", from_name);
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 		TIMESPEC_TO_TIMEVAL(&tv[0], &from_sb.st_atimespec);
 		TIMESPEC_TO_TIMEVAL(&tv[1], &from_sb.st_mtimespec);
 #else
diff --git a/usr.bin/xlint/common/emit.c b/usr.bin/xlint/common/emit.c
index 993515b054d1..0ee36016e3d2 100644
--- a/usr.bin/xlint/common/emit.c
+++ b/usr.bin/xlint/common/emit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: emit.c,v 1.3 2002/01/31 19:36:53 tv Exp $	*/
+/*	$NetBSD: emit.c,v 1.4 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit.c,v 1.3 2002/01/31 19:36:53 tv Exp $");
+__RCSID("$NetBSD: emit.c,v 1.4 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/xlint/common/inittyp.c b/usr.bin/xlint/common/inittyp.c
index 5b80d1c030d6..e347f8cdbc56 100644
--- a/usr.bin/xlint/common/inittyp.c
+++ b/usr.bin/xlint/common/inittyp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inittyp.c,v 1.5 2003/05/29 18:12:17 christos Exp $	*/
+/*	$NetBSD: inittyp.c,v 1.6 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: inittyp.c,v 1.5 2003/05/29 18:12:17 christos Exp $");
+__RCSID("$NetBSD: inittyp.c,v 1.6 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/xlint/common/mem.c b/usr.bin/xlint/common/mem.c
index b4e95e6eb982..83c2e8fa0e7b 100644
--- a/usr.bin/xlint/common/mem.c
+++ b/usr.bin/xlint/common/mem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $	*/
+/*	$NetBSD: mem.c,v 1.7 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $");
+__RCSID("$NetBSD: mem.c,v 1.7 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c
index e267728a8138..c0c3cc8f30a7 100644
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $ */
+/* $NetBSD: decl.c,v 1.33 2004/06/20 22:20:16 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $");
+__RCSID("$NetBSD: decl.c,v 1.33 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c
index 5f23c6742b0e..71080571d093 100644
--- a/usr.bin/xlint/lint1/emit1.c
+++ b/usr.bin/xlint/lint1/emit1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $ */
+/* $NetBSD: emit1.c,v 1.14 2004/06/20 22:20:16 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.14 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c
index 3f17d8e85bbd..8caf0b1ed8d5 100644
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: err.c,v 1.26 2002/11/02 20:14:10 perry Exp $	*/
+/*	$NetBSD: err.c,v 1.27 2004/06/20 22:20:16 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.26 2002/11/02 20:14:10 perry Exp $");
+__RCSID("$NetBSD: err.c,v 1.27 2004/06/20 22:20:16 jmc Exp $");
 #endif
 
 #include <sys/types.h>
diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index c064256bb2b8..75f25b6e5102 100644
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $	*/
+/*	$NetBSD: func.c,v 1.21 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $");
+__RCSID("$NetBSD: func.c,v 1.21 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c
index 0fc2f1b8c550..ca6cf005127d 100644
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.17 2002/12/06 03:27:39 thorpej Exp $	*/
+/*	$NetBSD: init.c,v 1.18 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.17 2002/12/06 03:27:39 thorpej Exp $");
+__RCSID("$NetBSD: init.c,v 1.18 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c
index 766c2d8b3ea5..3db67d425483 100644
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main1.c,v 1.14 2003/04/18 03:21:02 lukem Exp $	*/
+/*	$NetBSD: main1.c,v 1.15 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main1.c,v 1.14 2003/04/18 03:21:02 lukem Exp $");
+__RCSID("$NetBSD: main1.c,v 1.15 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <sys/types.h>
diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c
index c92ac169e254..05d5a64dda38 100644
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $	*/
+/*	$NetBSD: mem1.c,v 1.11 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.11 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <sys/types.h>
diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c
index 23e82b9f63cc..a4c3f51729ff 100644
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.36 2003/05/30 13:37:49 christos Exp $	*/
+/*	$NetBSD: tree.c,v 1.37 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.36 2003/05/30 13:37:49 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.37 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <stdlib.h>
diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c
index cb8198792369..fa64f4eae172 100644
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.16 2002/01/31 19:36:55 tv Exp $ */
+/* $NetBSD: chk.c,v 1.17 2004/06/20 22:20:17 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: chk.c,v 1.16 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: chk.c,v 1.17 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/xlint/lint2/hash.c b/usr.bin/xlint/lint2/hash.c
index 650c793dca87..d28b2c9472fe 100644
--- a/usr.bin/xlint/lint2/hash.c
+++ b/usr.bin/xlint/lint2/hash.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: hash.c,v 1.9 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: hash.c,v 1.9 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 /*
diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c
index f911c2928b3f..5ada8833e5b4 100644
--- a/usr.bin/xlint/lint2/main2.c
+++ b/usr.bin/xlint/lint2/main2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: main2.c,v 1.7 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: main2.c,v 1.7 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/xlint/lint2/mem2.c b/usr.bin/xlint/lint2/mem2.c
index 48557baae010..07ebdc126e51 100644
--- a/usr.bin/xlint/lint2/mem2.c
+++ b/usr.bin/xlint/lint2/mem2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $	*/
+/*	$NetBSD: mem2.c,v 1.9 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem2.c,v 1.9 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.bin/xlint/lint2/msg.c b/usr.bin/xlint/lint2/msg.c
index d3612e98f196..38b86902fb5d 100644
--- a/usr.bin/xlint/lint2/msg.c
+++ b/usr.bin/xlint/lint2/msg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.c,v 1.7 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: msg.c,v 1.8 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msg.c,v 1.7 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: msg.c,v 1.8 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c
index 62e00c6e5e9c..bc6ec9bde403 100644
--- a/usr.bin/xlint/lint2/read.c
+++ b/usr.bin/xlint/lint2/read.c
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $ */
+/* $NetBSD: read.c,v 1.14 2004/06/20 22:20:17 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $");
+__RCSID("$NetBSD: read.c,v 1.14 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <ctype.h>
diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c
index 837dcc50fbbd..94e9ec503d7e 100644
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.34 2004/01/26 21:51:11 dsl Exp $ */
+/* $NetBSD: xlint.c,v 1.35 2004/06/20 22:20:17 jmc Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.34 2004/01/26 21:51:11 dsl Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.35 2004/06/20 22:20:17 jmc Exp $");
 #endif
 
 #include <sys/param.h>
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 391587154608..7cbbffc2d80f 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.15 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -32,6 +32,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California.\n"
@@ -42,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California
 #if 0
 static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2004/06/20 22:20:17 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index 7f958954e22f..182ab78662f6 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: files.c,v 1.23 2003/11/24 21:44:37 christos Exp $	*/
+/*	$NetBSD: files.c,v 1.24 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)files.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/config/hash.c b/usr.sbin/config/hash.c
index f4a338515429..3ac5014ccfff 100644
--- a/usr.sbin/config/hash.c
+++ b/usr.sbin/config/hash.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.13 2003/11/25 19:34:05 rafal Exp $	*/
+/*	$NetBSD: hash.c,v 1.14 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)hash.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 9d653785f935..1356426b5c60 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.93 2004/06/05 05:07:02 itojun Exp $	*/
+/*	$NetBSD: main.c,v 1.94 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)main.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
 #define	COPYRIGHT(x)	__COPYRIGHT(x)
diff --git a/usr.sbin/config/mkdevsw.c b/usr.sbin/config/mkdevsw.c
index 2b7ef8a5d494..ec20c6c97168 100644
--- a/usr.sbin/config/mkdevsw.c
+++ b/usr.sbin/config/mkdevsw.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkdevsw.c,v 1.4 2003/05/17 18:53:01 itojun Exp $	*/
+/*	$NetBSD: mkdevsw.c,v 1.5 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,6 +36,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 88435a59eca4..afa63948efbc 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkheaders.c,v 1.35 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkheaders.c,v 1.36 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)mkheaders.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index 06c79a16d2b1..66f6ff4c2dc2 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkioconf.c,v 1.72 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkioconf.c,v 1.73 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)mkioconf.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index d3697a61c6d9..c14fb1e50b9a 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkmakefile.c,v 1.61 2004/06/04 07:28:26 thorpej Exp $	*/
+/*	$NetBSD: mkmakefile.c,v 1.62 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)mkmakefile.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c
index baa982180beb..e345e6c6ca15 100644
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkswap.c,v 1.16 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkswap.c,v 1.17 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)mkswap.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 98ef53800bbb..c77503ea6c60 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pack.c,v 1.15 2003/11/24 21:44:37 christos Exp $	*/
+/*	$NetBSD: pack.c,v 1.16 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)pack.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 076283561a68..689e1a7a8cc2 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.42 2004/05/22 04:04:13 grant Exp $	*/
+/*	$NetBSD: sem.c,v 1.43 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)sem.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdio.h>
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index 2f3eac7e8057..c59328b1ee29 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.20 2003/11/25 19:34:06 rafal Exp $	*/
+/*	$NetBSD: util.c,v 1.21 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/installboot/arch/amiga.c b/usr.sbin/installboot/arch/amiga.c
index 54dc2ffc93c1..399e49395de2 100644
--- a/usr.sbin/installboot/arch/amiga.c
+++ b/usr.sbin/installboot/arch/amiga.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: amiga.c,v 1.2 2003/04/15 14:22:14 dsl Exp $	*/
+/*	$NetBSD: amiga.c,v 1.3 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -39,9 +39,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: amiga.c,v 1.2 2003/04/15 14:22:14 dsl Exp $");
+__RCSID("$NetBSD: amiga.c,v 1.3 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/installboot/arch/i386.c b/usr.sbin/installboot/arch/i386.c
index 3581bc516d1c..5f6bb87841ac 100644
--- a/usr.sbin/installboot/arch/i386.c
+++ b/usr.sbin/installboot/arch/i386.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.15 2004/03/14 23:05:47 lukem Exp $ */
+/* $NetBSD: i386.c,v 1.16 2004/06/20 22:20:17 jmc Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: i386.c,v 1.15 2004/03/14 23:05:47 lukem Exp $");
+__RCSID("$NetBSD: i386.c,v 1.16 2004/06/20 22:20:17 jmc Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ i386_setboot(ib_params *params)
 {
 	int		retval, i, bpbsize;
 	uint8_t		*bootstrapbuf;
-	uint		bootstrapsize;
+	u_int		bootstrapsize;
 	ssize_t		rv;
 	uint32_t	magic;
 	struct x86_boot_params	*bp;
diff --git a/usr.sbin/installboot/arch/next68k.c b/usr.sbin/installboot/arch/next68k.c
index d947ca6404d2..e7e8372e47c5 100644
--- a/usr.sbin/installboot/arch/next68k.c
+++ b/usr.sbin/installboot/arch/next68k.c
@@ -1,4 +1,4 @@
-/* $NetBSD: next68k.c,v 1.2 2003/10/27 22:38:39 lukem Exp $ */
+/* $NetBSD: next68k.c,v 1.3 2004/06/20 22:20:17 jmc Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: next68k.c,v 1.2 2003/10/27 22:38:39 lukem Exp $");
+__RCSID("$NetBSD: next68k.c,v 1.3 2004/06/20 22:20:17 jmc Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -67,7 +67,7 @@ nextstep_checksum(const void *vbuf, const void *vlimit)
 {
 	const uint16_t *buf = vbuf;
 	const uint16_t *limit = vlimit;
-	uint sum = 0;
+	u_int sum = 0;
 
 	while (buf < limit) {
 		sum += be16toh(*buf++);
@@ -81,7 +81,7 @@ next68k_setboot(ib_params *params)
 {
 	int retval, labelupdated;
 	uint8_t *bootbuf;
-	uint bootsize;
+	u_int bootsize;
 	ssize_t rv;
 	uint32_t cd_secsize;
 	int sec_netonb_mult;
diff --git a/usr.sbin/installboot/arch/sparc64.c b/usr.sbin/installboot/arch/sparc64.c
index 768d70dfa5e5..44b6e4d0afce 100644
--- a/usr.sbin/installboot/arch/sparc64.c
+++ b/usr.sbin/installboot/arch/sparc64.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sparc64.c,v 1.13 2002/05/15 02:18:24 lukem Exp $	*/
+/*	$NetBSD: sparc64.c,v 1.14 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,9 +64,13 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sparc64.c,v 1.13 2002/05/15 02:18:24 lukem Exp $");
+__RCSID("$NetBSD: sparc64.c,v 1.14 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/installboot/ffs.c b/usr.sbin/installboot/ffs.c
index db821c64b0cb..ce579f96a2d5 100644
--- a/usr.sbin/installboot/ffs.c
+++ b/usr.sbin/installboot/ffs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.14 2004/03/21 21:18:40 dsl Exp $	*/
+/*	$NetBSD: ffs.c,v 1.15 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,13 +36,20 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.14 2004/03/21 21:18:40 dsl Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.15 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
+
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
+#endif
 
 #include <assert.h>
 #include <err.h>
diff --git a/usr.sbin/installboot/fstypes.c b/usr.sbin/installboot/fstypes.c
index 57a0aa400d28..fa1a4d1365df 100644
--- a/usr.sbin/installboot/fstypes.c
+++ b/usr.sbin/installboot/fstypes.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fstypes.c,v 1.6 2003/07/27 07:51:40 lukem Exp $	*/
+/*	$NetBSD: fstypes.c,v 1.7 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,9 +36,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: fstypes.c,v 1.6 2003/07/27 07:51:40 lukem Exp $");
+__RCSID("$NetBSD: fstypes.c,v 1.7 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/installboot/installboot.c b/usr.sbin/installboot/installboot.c
index 63c0c9c88def..31b7d76649f0 100644
--- a/usr.sbin/installboot/installboot.c
+++ b/usr.sbin/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: installboot.c,v 1.15 2004/03/13 22:51:50 dsl Exp $	*/
+/*	$NetBSD: installboot.c,v 1.16 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,9 +36,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.15 2004/03/13 22:51:50 dsl Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.16 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/utsname.h>
diff --git a/usr.sbin/installboot/machines.c b/usr.sbin/installboot/machines.c
index 958176a91e31..17067822160d 100644
--- a/usr.sbin/installboot/machines.c
+++ b/usr.sbin/installboot/machines.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machines.c,v 1.23 2004/03/13 22:51:50 dsl Exp $	*/
+/*	$NetBSD: machines.c,v 1.24 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,9 +36,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: machines.c,v 1.23 2004/03/13 22:51:50 dsl Exp $");
+__RCSID("$NetBSD: machines.c,v 1.24 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/installboot/sum.c b/usr.sbin/installboot/sum.c
index 0d8a9b105181..3ee59bc3211c 100644
--- a/usr.sbin/installboot/sum.c
+++ b/usr.sbin/installboot/sum.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sum.c,v 1.2 2002/04/19 07:08:53 lukem Exp $	*/
+/*	$NetBSD: sum.c,v 1.3 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,9 +66,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sum.c,v 1.2 2002/04/19 07:08:53 lukem Exp $");
+__RCSID("$NetBSD: sum.c,v 1.3 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/types.h>
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index d0c5affa8e0e..b6af6db4c7f1 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.28 2004/04/26 21:06:55 dsl Exp $	*/
+/*	$NetBSD: ffs.c,v 1.29 2004/06/20 22:20:17 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,13 +65,20 @@
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.28 2004/04/26 21:06:55 dsl Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.29 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
+
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
+#endif
 
 #include <assert.h>
 #include <errno.h>
diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c
index b4d7f2b87c54..3426cec7be50 100644
--- a/usr.sbin/makefs/ffs/buf.c
+++ b/usr.sbin/makefs/ffs/buf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.c,v 1.11 2003/10/16 06:31:38 itojun Exp $	*/
+/*	$NetBSD: buf.c,v 1.12 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -35,9 +35,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: buf.c,v 1.11 2003/10/16 06:31:38 itojun Exp $");
+__RCSID("$NetBSD: buf.c,v 1.12 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c
index 9c64f9436160..d810eca28c8e 100644
--- a/usr.sbin/makefs/ffs/ffs_alloc.c
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_alloc.c,v 1.13 2003/08/07 11:25:33 agc Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $	*/
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 
 /*
@@ -41,9 +41,13 @@
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.13 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/makefs/ffs/ffs_balloc.c b/usr.sbin/makefs/ffs/ffs_balloc.c
index a91c2eb0e504..8761e459e23f 100644
--- a/usr.sbin/makefs/ffs/ffs_balloc.c
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_balloc.c,v 1.12 2003/08/07 11:25:33 agc Exp $	*/
+/*	$NetBSD: ffs_balloc.c,v 1.13 2004/06/20 22:20:18 jmc Exp $	*/
 /* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
 
 /*
@@ -32,9 +32,13 @@
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_balloc.c,v 1.12 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ffs_balloc.c,v 1.13 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index 7c53b4c42b8c..7b8c468ebef5 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkfs.c,v 1.18 2003/09/07 14:24:09 fvdl Exp $	*/
+/*	$NetBSD: mkfs.c,v 1.19 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -38,13 +38,17 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #else
 #ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.18 2003/09/07 14:24:09 fvdl Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.19 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif
 #endif /* not lint */
diff --git a/usr.sbin/makefs/ffs/ufs_bmap.c b/usr.sbin/makefs/ffs/ufs_bmap.c
index 1e886548bd5f..8e21ae603239 100644
--- a/usr.sbin/makefs/ffs/ufs_bmap.c
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_bmap.c,v 1.13 2003/08/07 11:25:33 agc Exp $	*/
+/*	$NetBSD: ufs_bmap.c,v 1.14 2004/06/20 22:20:18 jmc Exp $	*/
 /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
 
 /*
@@ -37,9 +37,13 @@
  *	@(#)ufs_bmap.c	8.8 (Berkeley) 8/11/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ufs_bmap.c,v 1.13 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ufs_bmap.c,v 1.14 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index 9cba3741be55..4a64ab397a0a 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: makefs.c,v 1.19 2004/01/05 23:23:38 jmmv Exp $	*/
+/*	$NetBSD: makefs.c,v 1.20 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -35,9 +35,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.19 2004/01/05 23:23:38 jmmv Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.20 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <assert.h>
@@ -67,7 +71,7 @@ static fstype_t fstypes[] = {
 	{ NULL	},
 };
 
-uint		debug;
+u_int		debug;
 struct timespec	start_time;
 
 static	fstype_t *get_fstype(const char *);
diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h
index bded407c10bb..ada563b1c5e6 100644
--- a/usr.sbin/makefs/makefs.h
+++ b/usr.sbin/makefs/makefs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: makefs.h,v 1.13 2004/04/21 01:05:48 christos Exp $	*/
+/*	$NetBSD: makefs.h,v 1.14 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -183,7 +183,7 @@ void		ffs_makefs(const char *, const char *, fsnode *, fsinfo_t *);
 
 
 
-extern	uint		debug;
+extern	u_int		debug;
 extern	struct timespec	start_time;
 
 /*
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index 94975fb2afa2..da7a402a2e3d 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: walk.c,v 1.16 2004/05/31 22:24:51 lukem Exp $	*/
+/*	$NetBSD: walk.c,v 1.17 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,9 +71,13 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.16 2004/05/31 22:24:51 lukem Exp $");
+__RCSID("$NetBSD: walk.c,v 1.17 2004/06/20 22:20:18 jmc Exp $");
 #endif	/* !__lint */
 
 #include <sys/param.h>
@@ -129,11 +133,13 @@ walk_dir(const char *dir, fsnode *parent)
 			errx(1, "Pathname too long.");
 		if (lstat(path, &stbuf) == -1)
 			err(1, "Can't lstat `%s'", path);
+#ifdef S_ISSOCK
 		if (S_ISSOCK(stbuf.st_mode & S_IFMT)) {
 			if (debug & DEBUG_WALK_DIR_NODE)
 				printf("  skipping socket %s\n", path);
 			continue;
 		}
+#endif
 
 		cur = create_fsnode(dent->d_name, &stbuf);
 		cur->parent = parent;
@@ -401,8 +407,8 @@ apply_specentry(const char *dir, NODE *specnode, fsnode *dirnode)
 		dirnode->inode->st.st_atime =		specnode->st_mtimespec.tv_sec;
 		dirnode->inode->st.st_ctime =		start_time.tv_sec;
 #if HAVE_STRUCT_STAT_ST_MTIMENSEC
-		dirnode->inode->st.st_mtimensec =	specnode->st_mtimensec;
-		dirnode->inode->st.st_atimensec =	specnode->st_mtimensec;
+		dirnode->inode->st.st_mtimensec =	specnode->st_mtimespec.tv_nsec;
+		dirnode->inode->st.st_atimensec =	specnode->st_mtimespec.tv_nsec;
 		dirnode->inode->st.st_ctimensec =	start_time.tv_nsec;
 #endif
 	}
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 11e392299d64..0d2d51b87b68 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compare.c,v 1.43 2003/08/07 11:25:35 agc Exp $	*/
+/*	$NetBSD: compare.c,v 1.44 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: compare.c,v 1.43 2003/08/07 11:25:35 agc Exp $");
+__RCSID("$NetBSD: compare.c,v 1.44 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -150,14 +154,16 @@ compare(NODE *s, FTSENT *p)
 		if (!S_ISLNK(p->fts_statp->st_mode))
 			goto typeerr;
 		break;
+#ifdef S_ISSOCK
 	case F_SOCK:
-		if (!S_ISSOCK(p->fts_statp->st_mode)) {
- typeerr:		LABEL;
-			printf("\ttype (%s, %s)\n",
-			    nodetype(s->type), inotype(p->fts_statp->st_mode));
-			return (label);
-		}
+		if (!S_ISSOCK(p->fts_statp->st_mode))
+			goto typeerr;
 		break;
+#endif
+typeerr:		LABEL;
+		printf("\ttype (%s, %s)\n",
+		    nodetype(s->type), inotype(p->fts_statp->st_mode));
+		return (label);
 	}
 	if (Wflag)
 		goto afterpermwhack;
@@ -285,7 +291,7 @@ compare(NODE *s, FTSENT *p)
 		struct stat *ps = p->fts_statp;
 		time_t smtime = s->st_mtimespec.tv_sec;
 
-#ifdef BSD4_4
+#if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
 		time_t pmtime = ps->st_mtimespec.tv_sec;
 
 		TIMESPEC_TO_TIMEVAL(&tv[0], &s->st_mtimespec);
diff --git a/usr.sbin/mtree/crc.c b/usr.sbin/mtree/crc.c
index c8dbe2fe92ce..bb45bdb81acd 100644
--- a/usr.sbin/mtree/crc.c
+++ b/usr.sbin/mtree/crc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.5 2003/08/07 11:25:35 agc Exp $	*/
+/*	$NetBSD: crc.c,v 1.6 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.5 2003/08/07 11:25:35 agc Exp $");
+__RCSID("$NetBSD: crc.c,v 1.6 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index cb0132ecf683..e766502e1c40 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.44 2003/10/27 00:12:44 lukem Exp $	*/
+/*	$NetBSD: create.c,v 1.45 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.44 2003/10/27 00:12:44 lukem Exp $");
+__RCSID("$NetBSD: create.c,v 1.45 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -180,7 +184,7 @@ statf(FTSENT *p)
 		output(&indent, "nlink=%u", p->fts_statp->st_nlink);
 	if (keys & F_SIZE && S_ISREG(p->fts_statp->st_mode))
 		output(&indent, "size=%lld", (long long)p->fts_statp->st_size);
-#ifdef BSD4_4
+#if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
 	if (keys & F_TIME)
 		output(&indent, "time=%ld.%ld",
 		    (long)p->fts_statp->st_mtimespec.tv_sec,
diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c
index d82cf732909c..4b46b8909291 100644
--- a/usr.sbin/mtree/excludes.c
+++ b/usr.sbin/mtree/excludes.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: excludes.c,v 1.12 2003/11/17 00:02:33 dbj Exp $	*/
+/*	$NetBSD: excludes.c,v 1.13 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright 2000 Massachusetts Institute of Technology
@@ -29,10 +29,14 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: excludes.c,v 1.12 2003/11/17 00:02:33 dbj Exp $");
+__RCSID("$NetBSD: excludes.c,v 1.13 2004/06/20 22:20:18 jmc Exp $");
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/mtree/getid.c b/usr.sbin/mtree/getid.c
index be660d5b5a2d..e6ff045c68c5 100644
--- a/usr.sbin/mtree/getid.c
+++ b/usr.sbin/mtree/getid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getid.c,v 1.4 2003/08/07 11:25:35 agc Exp $	*/
+/*	$NetBSD: getid.c,v 1.5 2004/06/20 22:20:18 jmc Exp $	*/
 /*	from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */
 /*	from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */
 
@@ -67,6 +67,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 
 #include <grp.h>
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index f8ea03379822..1f3e850e1a6f 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.24 2003/08/07 11:25:35 agc Exp $	*/
+/*	$NetBSD: misc.c,v 1.25 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -31,9 +31,13 @@
  *	@(#)misc.c	8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: misc.c,v 1.24 2003/08/07 11:25:35 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.25 2004/06/20 22:20:18 jmc Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -244,8 +248,10 @@ nodetoino(u_int type)
 		return S_IFREG;
 	case F_LINK:
 		return S_IFLNK;
+#ifdef S_IFSOCK
 	case F_SOCK:
 		return S_IFSOCK;
+#endif
 	default:
 		printf("unknown type %d", type);
 		abort();
@@ -278,8 +284,10 @@ inotype(u_int type)
 		return ("file");
 	case S_IFLNK:
 		return ("link");
+#ifdef S_IFSOCK
 	case S_IFSOCK:
 		return ("socket");
+#endif
 	default:
 		return ("unknown");
 	}
diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c
index af853f5401fb..c6b80d73d907 100644
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mtree.c,v 1.30 2003/08/07 11:25:36 agc Exp $	*/
+/*	$NetBSD: mtree.c,v 1.31 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1990, 1993
@@ -29,6 +29,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1989, 1990, 1993\n\
@@ -39,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: mtree.c,v 1.30 2003/08/07 11:25:36 agc Exp $");
+__RCSID("$NetBSD: mtree.c,v 1.31 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 319f3e07cd27..58d7c5f698b7 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec.c,v 1.55 2004/05/11 17:11:03 christos Exp $	*/
+/*	$NetBSD: spec.c,v 1.56 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -65,12 +65,16 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)spec.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: spec.c,v 1.55 2004/05/11 17:11:03 christos Exp $");
+__RCSID("$NetBSD: spec.c,v 1.56 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 69aeff6facd8..2a69a11a269f 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verify.c,v 1.36 2003/10/27 00:12:44 lukem Exp $	*/
+/*	$NetBSD: verify.c,v 1.37 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: verify.c,v 1.36 2003/10/27 00:12:44 lukem Exp $");
+__RCSID("$NetBSD: verify.c,v 1.37 2004/06/20 22:20:18 jmc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index cf94c4c9870f..da2ad7241db2 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwd_mkdb.c,v 1.28 2003/10/27 00:12:44 lukem Exp $	*/
+/*	$NetBSD: pwd_mkdb.c,v 1.29 2004/06/20 22:20:18 jmc Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993, 1994
@@ -65,9 +65,15 @@ __COPYRIGHT("@(#) Copyright (c) 2000\n\
 Copyright (c) 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n");
 __SCCSID("from: @(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94");
-__RCSID("$NetBSD: pwd_mkdb.c,v 1.28 2003/10/27 00:12:44 lukem Exp $");
+__RCSID("$NetBSD: pwd_mkdb.c,v 1.29 2004/06/20 22:20:18 jmc Exp $");
 #endif /* not lint */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_pwd.h"
+#else
+#include <pwd.h>
+#endif
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -83,12 +89,6 @@ __RCSID("$NetBSD: pwd_mkdb.c,v 1.28 2003/10/27 00:12:44 lukem Exp $");
 #include <unistd.h>
 #include <util.h>
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "compat_pwd.h"
-#else
-#include <pwd.h>
-#endif
-
 #define	MAX_CACHESIZE	8*1024*1024
 #define	MIN_CACHESIZE	2*1024*1024