NetBSD Problem Report #27221

Received: (qmail 10231 invoked by uid 605); 11 Oct 2004 01:10:08 -0000
Message-Id: <20041011011005.BE33F23419@thoreau.thistledown.com.au>
Date: Mon, 11 Oct 2004 11:10:05 +1000 (EST)
From: simonb@wasabisystems.com
Sender: gnats-bugs-owner@NetBSD.org
Reply-To: simonb@thistledown.com.au
To: gnats-bugs@gnats.NetBSD.org
Subject: tools/makefs doesn't build
X-Send-Pr-Version: 3.95

>Number:         27221
>Category:       toolchain
>Synopsis:       tools/makefs doesn't build
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    toolchain-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 11 01:11:00 +0000 2004
>Closed-Date:    Tue Oct 12 03:29:08 +0000 2004
>Last-Modified:  Tue Oct 12 03:30:00 +0000 2004
>Originator:     Simon Burge
>Release:        NetBSD 2.99.9, userland from 8th April 2004.
>Organization:
Wasabi Systems
>Environment:
System: NetBSD euclid 2.99.9 NetBSD 2.99.9 (EUCLID)
	#489: Sat Oct 9 15:25:20 EST 2004
	simonb@euclid:/home/netbsd/obj/sys/arch/i386/compile/EUCLID i386
Architecture: i386
Machine: i386
>Description:
	tools/makefs fails to build because it expects fstatvfs() to
	be available, but isn't.

cc -O -I. -I/home/netbsd/i386/obj/home/netbsd/src/tools/compat -I/home/netbsd/i386/obj/home/netbsd/src/tools/compat/include  -I/home/netbsd/src/tools/makefs/../compat -DHAVE_NBTOOL_CONFIG_H=1  -D_FILE_OFFSET_BITS=64  -I/home/netbsd/src/tools/makefs/../../usr.sbin/makefs  -I/home/netbsd/src/bin/ls -I/home/netbsd/src/sbin/mknod -I/home/netbsd/src/usr.sbin/mtree   -o makefs makefs.lo walk.lo ffs.lo mkfs.lo buf.lo getid.lo misc.lo spec.lo pack_dev.lo stat_flags.lo ffs_alloc.lo ffs_balloc.lo ffs_bswap.lo ffs_subr.lo ffs_tables.lo ufs_bmap.lo -L/home/netbsd/i386/obj/home/netbsd/src/tools/compat -lnbcompat -lz
ffs.lo(.text+0xee6): In function `ffs_create_image':
: undefined reference to `fstatvfs'

euclid 93> nm -n /lib/libc.so | grep fstat
00047834 T fstat
0007a998 T fstatfs
0008daac T __fstat13

>How-To-Repeat:
	./build.sh release

>Fix:
	None given.  Add fstatfs() to libnbcompat?
>Release-Note:
>Audit-Trail:

From: James Chacon <jmc@netbsd.org>
To: simonb@thistledown.com.au
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: toolchain/27221: tools/makefs doesn't build
Date: Mon, 11 Oct 2004 13:28:59 -0500

 --XsQoSWH+UP9D9v3l
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 On Mon, Oct 11, 2004 at 11:10:05AM +1000, simonb@wasabisystems.com wrote:
 > 
 > >Number:         27221
 > >Category:       toolchain
 > >Synopsis:       tools/makefs doesn't build
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       low
 > >Responsible:    toolchain-manager
 > >State:          open
 > >Class:          sw-bug
 > >Submitter-Id:   net
 > >Arrival-Date:   Mon Oct 11 01:11:00 UTC 2004
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Simon Burge
 > >Release:        NetBSD 2.99.9, userland from 8th April 2004.
 > >Organization:
 > Wasabi Systems
 > >Environment:
 > System: NetBSD euclid 2.99.9 NetBSD 2.99.9 (EUCLID)
 > 	#489: Sat Oct 9 15:25:20 EST 2004
 > 	simonb@euclid:/home/netbsd/obj/sys/arch/i386/compile/EUCLID i386
 > Architecture: i386
 > Machine: i386
 > >Description:
 > 	tools/makefs fails to build because it expects fstatvfs() to
 > 	be available, but isn't.
 > 
 > cc -O -I. -I/home/netbsd/i386/obj/home/netbsd/src/tools/compat -I/home/netbsd/i386/obj/home/netbsd/src/tools/compat/include
 -I/home/netbsd/src/tools/makefs/../compat -DHAVE_NBTOOL_CONFIG_H=1  -D_FILE_OFFSET_BITS=64  -I/home/netbsd/src/tools/makefs/../../usr.sbin/makefs
 -I/home/netbsd/src/bin/ls -I/home/netbsd/src/sbin/mknod -I/home/netbsd/src/usr.sbin/mtree   -o makefs makefs.lo walk.lo ffs.lo mkfs.lo buf.lo getid.lo
 misc.lo spec.lo pack_dev.lo stat_flags.lo ffs_alloc.lo ffs_balloc.lo ffs_bswap.lo ffs_subr.lo ffs_tables.lo ufs_bmap.lo
 -L/home/netbsd/i386/obj/home/netbsd/src/tools/compat -lnbcompat -lz
 > ffs.lo(.text+0xee6): In function `ffs_create_image':
 > : undefined reference to `fstatvfs'
 > 
 > euclid 93> nm -n /lib/libc.so | grep fstat
 > 00047834 T fstat
 > 0007a998 T fstatfs
 > 0008daac T __fstat13
 > 
 > >How-To-Repeat:
 > 	./build.sh release
 > 
 > >Fix:
 > 	None given.  Add fstatfs() to libnbcompat?

 Can you try the attached patch for me?

 James

 --XsQoSWH+UP9D9v3l
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=diff

 Index: usr.sbin/makefs/ffs.c
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/makefs/ffs.c,v
 retrieving revision 1.31
 diff -u -r1.31 ffs.c
 --- usr.sbin/makefs/ffs.c	24 Jul 2004 16:30:50 -0000	1.31
 +++ usr.sbin/makefs/ffs.c	11 Oct 2004 18:28:54 -0000
 @@ -445,11 +445,11 @@
  	}

  		/* zero image */
 -#if HAVE_STRUCT_STATVFS_F_IOSIZE
 +#if HAVE_STRUCT_STATVFS_F_IOSIZE && HAVE_FSTATVFS
  	if (fstatvfs(fsopts->fd, &sfs) == -1) {
  #endif
  		bufsize = 8192;
 -#if HAVE_STRUCT_STATVFS_F_IOSIZE
 +#if HAVE_STRUCT_STATVFS_F_IOSIZE && HAVE_FSTATVFS
  		warn("can't fstatvfs `%s', using default %d byte chunk",
  		    image, bufsize);
  	} else
 Index: tools/compat/nbtool_config.h.in
 ===================================================================
 RCS file: /cvsroot/src/tools/compat/nbtool_config.h.in,v
 retrieving revision 1.6
 diff -u -r1.6 nbtool_config.h.in
 --- tools/compat/nbtool_config.h.in	24 Jul 2004 16:32:01 -0000	1.6
 +++ tools/compat/nbtool_config.h.in	11 Oct 2004 18:28:54 -0000
 @@ -40,6 +40,8 @@
  #undef HAVE_U_SHORT
  #undef HAVE_U_QUAD_T

 +#undef HAVE_FSTATVFS
 +
  #undef HAVE_BSWAP16
  #undef HAVE_BSWAP32
  #undef HAVE_BSWAP64
 Index: tools/compat/configure
 ===================================================================
 RCS file: /cvsroot/src/tools/compat/configure,v
 retrieving revision 1.47
 diff -u -r1.47 configure
 --- tools/compat/configure	24 Jul 2004 16:32:01 -0000	1.47
 +++ tools/compat/configure	11 Oct 2004 18:28:59 -0000
 @@ -1,14 +1,83 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by Autoconf 2.52 for libnbcompat noversion.
 +# Generated by GNU Autoconf 2.59 for libnbcompat noversion.
  #
  # Report bugs to <lib-bug-people@NetBSD.org>.
  #
 -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 -# Free Software Foundation, Inc.
 +# Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
 +## --------------------- ##
 +## M4sh Initialization.  ##
 +## --------------------- ##

 +# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
 +  set -o posix
 +fi
 +DUALCASE=1; export DUALCASE # for MKS sh
 +
 +# Support unset when possible.
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  as_unset=unset
 +else
 +  as_unset=false
 +fi
 +
 +
 +# Work around bugs in pre-3.0 UWIN ksh.
 +$as_unset ENV MAIL MAILPATH
 +PS1='$ '
 +PS2='> '
 +PS4='+ '
 +
 +# NLS nuisances.
 +for as_var in \
 +  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 +  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 +  LC_TELEPHONE LC_TIME
 +do
 +  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 +    eval $as_var=C; export $as_var
 +  else
 +    $as_unset $as_var
 +  fi
 +done
 +
 +# Required to use basename.
 +if expr a : '\(a\)' >/dev/null 2>&1; then
 +  as_expr=expr
 +else
 +  as_expr=false
 +fi
 +
 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
 +fi
 +
 +
 +# Name of the executable.
 +as_me=`$as_basename "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 +	 X"$0" : 'X\(//\)$' \| \
 +	 X"$0" : 'X\(/\)$' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
 +echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
 +  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 +  	  /^X\/\(\/\).*/{ s//\1/; q; }
 +  	  s/.*/./; q'`
 +
 +
 +# PATH needs CR, and LINENO needs CR and PATH.
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 @@ -16,22 +85,113 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits

 -# Sed expression to map a string onto a valid variable name.
 -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  echo "#! /bin/sh" >conf$$.sh
 +  echo  "exit 0"   >>conf$$.sh
 +  chmod +x conf$$.sh
 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 +    PATH_SEPARATOR=';'
 +  else
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
 +fi

 -# Sed expression to map a string onto a valid CPP name.
 -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"

 -# Be Bourne compatible
 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 -  emulate sh
 -  NULLCMD=:
 -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
 -  set -o posix
 -fi
 +  as_lineno_1=$LINENO
 +  as_lineno_2=$LINENO
 +  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 +  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 +  # Find who we are.  Look in the path if we contain no path at all
 +  # relative or not.
 +  case $0 in
 +    *[\\/]* ) as_myself=$0 ;;
 +    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +done
 +
 +       ;;
 +  esac
 +  # We did not find ourselves, most probably we were run as `sh COMMAND'
 +  # in which case we are not to be found in the path.
 +  if test "x$as_myself" = x; then
 +    as_myself=$0
 +  fi
 +  if test ! -f "$as_myself"; then
 +    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
 +   { (exit 1); exit 1; }; }
 +  fi
 +  case $CONFIG_SHELL in
 +  '')
 +    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for as_base in sh bash ksh sh5; do
 +	 case $as_dir in
 +	 /*)
 +	   if ("$as_dir/$as_base" -c '
 +  as_lineno_1=$LINENO
 +  as_lineno_2=$LINENO
 +  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 +  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 +	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 +	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 +	     CONFIG_SHELL=$as_dir/$as_base
 +	     export CONFIG_SHELL
 +	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
 +	   fi;;
 +	 esac
 +       done
 +done
 +;;
 +  esac
 +
 +  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 +  # uniformly replaced by the line number.  The first 'sed' inserts a
 +  # line-number line before each line; the second 'sed' does the real
 +  # work.  The second script uses 'N' to pair each line-number line
 +  # with the numbered line, and appends trailing '-' during
 +  # substitution so that $LINENO is not a special case at line end.
 +  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
 +  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
 +  sed '=' <$as_myself |
 +    sed '
 +      N
 +      s,$,-,
 +      : loop
 +      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      t loop
 +      s,-$,,
 +      s,^['$as_cr_digits']*\n,,
 +    ' >$as_me.lineno &&
 +  chmod +x $as_me.lineno ||
 +    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 +   { (exit 1); exit 1; }; }
 +
 +  # Don't try to exec as it changes $[0], causing all sort of problems
 +  # (the dirname of $[0] is not the place where we might find the
 +  # original and so on.  Autoconf is especially sensible to this).
 +  . ./$as_me.lineno
 +  # Exit status is that of the last command.
 +  exit
 +}

 -# Name of the executable.
 -as_me=`echo "$0" |sed 's,.*[\\/],,'`
 +
 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 +  *c*,-n*) ECHO_N= ECHO_C='
 +' ECHO_T='	' ;;
 +  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 +  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 +esac

  if expr a : '\(a\)' >/dev/null 2>&1; then
    as_expr=expr
 @@ -57,24 +217,21 @@
  fi
  rm -f conf$$ conf$$.exe conf$$.file

 -as_executable_p="test -f"
 -
 -# Support unset when possible.
 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 -  as_unset=unset
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p=:
  else
 -  as_unset=false
 +  test -d ./-p && rmdir ./-p
 +  as_mkdir_p=false
  fi

 -# NLS nuisances.
 -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
 -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
 -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
 -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
 -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
 -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
 -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
 -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
 +as_executable_p="test -f"
 +
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 +
 +# Sed expression to map a string onto a valid variable name.
 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 +

  # IFS
  # We need space, tab and new line, in precisely that order.
 @@ -83,7 +240,8 @@
  IFS=" 	$as_nl"

  # CDPATH.
 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 +$as_unset CDPATH
 +

  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 @@ -96,9 +254,11 @@
  # Initializations.
  #
  ac_default_prefix=/usr/local
 +ac_config_libobj_dir=.
  cross_compiling=no
  subdirs=
 -MFLAGS= MAKEFLAGS=
 +MFLAGS=
 +MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}

  # Maximum number of lines to put in a shell here document.
 @@ -106,6 +266,13 @@
  # only ac_max_sed_lines should be used.
  : ${ac_max_here_lines=38}

 +# Identity of this package.
 +PACKAGE_NAME='libnbcompat'
 +PACKAGE_TARNAME='libnbcompat'
 +PACKAGE_VERSION='noversion'
 +PACKAGE_STRING='libnbcompat noversion'
 +PACKAGE_BUGREPORT='lib-bug-people@NetBSD.org'
 +
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
 @@ -143,6 +310,9 @@
  # include <unistd.h>
  #endif"

 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
 program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
 build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP BSHELL ALLOCA LIBOBJS
 LTLIBOBJS'
 +ac_subst_files=''
 +
  # Initialize some variables set by options.
  ac_init_help=
  ac_init_version=false
 @@ -181,13 +351,6 @@
  infodir='${prefix}/info'
  mandir='${prefix}/man'

 -# Identity of this package.
 -PACKAGE_NAME='libnbcompat'
 -PACKAGE_TARNAME='libnbcompat'
 -PACKAGE_VERSION='noversion'
 -PACKAGE_STRING='libnbcompat noversion'
 -PACKAGE_BUGREPORT='lib-bug-people@NetBSD.org'
 -
  ac_prev=
  for ac_option
  do
 @@ -320,7 +483,7 @@
      with_fp=no ;;

    -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 -  | --no-cr | --no-c)
 +  | --no-cr | --no-c | -n)
      no_create=yes ;;

    -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 @@ -499,30 +662,31 @@
    eval ac_val=$`echo $ac_var`
    case $ac_val in
      [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
 +    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     { (exit 1); exit 1; }; };;
    esac
  done

  # Be sure to have absolute paths.
  for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
 -              localstatedir libdir includedir oldincludedir infodir mandir
 +	      localstatedir libdir includedir oldincludedir infodir mandir
  do
    eval ac_val=$`echo $ac_var`
    case $ac_val in
      [\\/$]* | ?:[\\/]* ) ;;
 -    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
 +    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
     { (exit 1); exit 1; }; };;
    esac
  done

  # There might be people who depend on the old broken behavior: `$host'
  # used to hold the argument of --host etc.
 +# FIXME: To remove some day.
  build=$build_alias
  host=$host_alias
  target=$target_alias

 -# FIXME: should be removed in autoconf 3.0.
 +# FIXME: To remove some day.
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
 @@ -538,13 +702,23 @@

  test "$silent" = yes && exec 6>/dev/null

 +
  # Find the source files, if location was not specified.
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
    # Try the directory containing this script, then its parent.
 -  ac_prog=$0
 -  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
 -  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
 +  ac_confdir=`(dirname "$0") 2>/dev/null ||
 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$0" : 'X\(//\)[^/]' \| \
 +	 X"$0" : 'X\(//\)$' \| \
 +	 X"$0" : 'X\(/\)' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
 +echo X"$0" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 +  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 +  	  /^X\(\/\/\)$/{ s//\1/; q; }
 +  	  /^X\(\/\).*/{ s//\1/; q; }
 +  	  s/.*/./; q'`
    srcdir=$ac_confdir
    if test ! -r $srcdir/$ac_unique_file; then
      srcdir=..
 @@ -554,13 +728,16 @@
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
 -    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
 +    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
     { (exit 1); exit 1; }; }
    else
 -    { echo "$as_me: error: cannot find sources in $srcdir" >&2
 +    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
    fi
  fi
 +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
 +  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
 +   { (exit 1); exit 1; }; }
  srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
  ac_env_build_alias_set=${build_alias+set}
  ac_env_build_alias_value=$build_alias
 @@ -601,7 +778,7 @@
  if test "$ac_init_help" = "long"; then
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
 -  cat <<EOF
 +  cat <<_ACEOF
  \`configure' configures libnbcompat noversion to adapt to many kinds of systems.

  Usage: $0 [OPTION]... [VAR=VALUE]...
 @@ -622,14 +799,14 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']

 -EOF
 +_ACEOF

 -  cat <<EOF
 +  cat <<_ACEOF
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
 -                          [$ac_default_prefix]
 +			  [$ac_default_prefix]
    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
 -                          [PREFIX]
 +			  [PREFIX]

  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 @@ -651,17 +828,17 @@
    --oldincludedir=DIR    C header files for non-gcc [/usr/include]
    --infodir=DIR          info documentation [PREFIX/info]
    --mandir=DIR           man documentation [PREFIX/man]
 -EOF
 +_ACEOF

 -  cat <<\EOF
 -EOF
 +  cat <<\_ACEOF
 +_ACEOF
  fi

  if test -n "$ac_init_help"; then
    case $ac_init_help in
       short | recursive ) echo "Configuration of libnbcompat noversion:";;
     esac
 -  cat <<\EOF
 +  cat <<\_ACEOF

  Some influential environment variables:
    CC          C compiler command
 @@ -676,40 +853,93 @@
  it to find libraries and programs with nonstandard names/locations.

  Report bugs to <lib-bug-people@NetBSD.org>.
 -EOF
 +_ACEOF
  fi

  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    ac_popdir=`pwd`
 -  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
 -    cd $ac_subdir
 -    # A "../" for each directory in /$ac_subdir.
 -    ac_dots=`echo $ac_subdir |
 -             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 -
 -    case $srcdir in
 -    .) # No --srcdir option.  We are building in place.
 -      ac_sub_srcdir=$srcdir ;;
 -    [\\/]* | ?:[\\/]* ) # Absolute path.
 -      ac_sub_srcdir=$srcdir/$ac_subdir ;;
 -    *) # Relative path.
 -      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
 -    esac
 +  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 +    test -d $ac_dir || continue
 +    ac_builddir=.
 +
 +if test "$ac_dir" != .; then
 +  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 +  # A "../" for each directory in $ac_dir_suffix.
 +  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 +else
 +  ac_dir_suffix= ac_top_builddir=
 +fi
 +
 +case $srcdir in
 +  .)  # No --srcdir option.  We are building in place.
 +    ac_srcdir=.
 +    if test -z "$ac_top_builddir"; then
 +       ac_top_srcdir=.
 +    else
 +       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
 +    fi ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_srcdir=$srcdir$ac_dir_suffix;
 +    ac_top_srcdir=$srcdir ;;
 +  *) # Relative path.
 +    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 +    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 +esac
 +
 +# Do not use `cd foo && pwd` to compute absolute paths, because
 +# the directories may not exist.
 +case `pwd` in
 +.) ac_abs_builddir="$ac_dir";;
 +*)
 +  case "$ac_dir" in
 +  .) ac_abs_builddir=`pwd`;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
 +  *) ac_abs_builddir=`pwd`/"$ac_dir";;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
 +*)
 +  case ${ac_top_builddir}. in
 +  .) ac_abs_top_builddir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
 +  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_srcdir=$ac_srcdir;;
 +*)
 +  case $ac_srcdir in
 +  .) ac_abs_srcdir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
 +  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
 +*)
 +  case $ac_top_srcdir in
 +  .) ac_abs_top_srcdir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 +  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 +  esac;;
 +esac

 +    cd $ac_dir
      # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_sub_srcdir/configure.gnu; then
 +    if test -f $ac_srcdir/configure.gnu; then
        echo
 -      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
 -    elif test -f $ac_sub_srcdir/configure; then
 +      $SHELL $ac_srcdir/configure.gnu  --help=recursive
 +    elif test -f $ac_srcdir/configure; then
        echo
 -      $SHELL $ac_sub_srcdir/configure  --help=recursive
 -    elif test -f $ac_sub_srcdir/configure.ac ||
 -           test -f $ac_sub_srcdir/configure.in; then
 +      $SHELL $ac_srcdir/configure  --help=recursive
 +    elif test -f $ac_srcdir/configure.ac ||
 +	   test -f $ac_srcdir/configure.in; then
        echo
        $ac_configure --help
      else
 -      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
 +      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
      cd $ac_popdir
    done
 @@ -717,33 +947,32 @@

  test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
 -  cat <<\EOF
 +  cat <<\_ACEOF
  libnbcompat configure noversion
 -generated by GNU Autoconf 2.52
 +generated by GNU Autoconf 2.59

 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
 +Copyright (C) 2003 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 -EOF
 +_ACEOF
    exit 0
  fi
  exec 5>config.log
 -cat >&5 <<EOF
 +cat >&5 <<_ACEOF
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.

  It was created by libnbcompat $as_me noversion, which was
 -generated by GNU Autoconf 2.52.  Invocation command line was
 +generated by GNU Autoconf 2.59.  Invocation command line was

    $ $0 $@

 -EOF
 +_ACEOF
  {
  cat <<_ASUNAME
 -## ---------- ##
 -## Platform.  ##
 -## ---------- ##
 +## --------- ##
 +## Platform. ##
 +## --------- ##

  hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
  uname -m = `(uname -m) 2>/dev/null || echo unknown`
 @@ -762,79 +991,156 @@
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`

 -PATH = $PATH
 -
  _ASUNAME
 +
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  echo "PATH: $as_dir"
 +done
 +
  } >&5

 -cat >&5 <<EOF
 -## ------------ ##
 -## Core tests.  ##
 -## ------------ ##
 +cat >&5 <<_ACEOF
 +
 +
 +## ----------- ##
 +## Core tests. ##
 +## ----------- ##
 +
 +_ACEOF

 -EOF

  # Keep a trace of the command line.
  # Strip out --no-create and --no-recursion so they do not pile up.
 +# Strip out --silent because we don't want to record it for future runs.
  # Also quote any args containing shell meta-characters.
 +# Make two passes to allow for proper duplicate-argument suppression.
  ac_configure_args=
 +ac_configure_args0=
 +ac_configure_args1=
  ac_sep=
 -for ac_arg
 +ac_must_keep_next=false
 +for ac_pass in 1 2
  do
 -  case $ac_arg in
 -  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 -  | --no-cr | --no-c) ;;
 -  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 -  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
 -  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
 -    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
 -    ac_sep=" " ;;
 -  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
 -     ac_sep=" " ;;
 -  esac
 -  # Get rid of the leading space.
 +  for ac_arg
 +  do
 +    case $ac_arg in
 +    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
 +    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 +    | -silent | --silent | --silen | --sile | --sil)
 +      continue ;;
 +    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 +      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    esac
 +    case $ac_pass in
 +    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
 +    2)
 +      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
 +      if test $ac_must_keep_next = true; then
 +	ac_must_keep_next=false # Got value, back to normal.
 +      else
 +	case $ac_arg in
 +	  *=* | --config-cache | -C | -disable-* | --disable-* \
 +	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
 +	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
 +	  | -with-* | --with-* | -without-* | --without-* | --x)
 +	    case "$ac_configure_args0 " in
 +	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
 +	    esac
 +	    ;;
 +	  -* ) ac_must_keep_next=true ;;
 +	esac
 +      fi
 +      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
 +      # Get rid of the leading space.
 +      ac_sep=" "
 +      ;;
 +    esac
 +  done
  done
 +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
 +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }

  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
 +# WARNING: Be sure not to use single quotes in there, as some shells,
 +# such as our DU 5.0 friend, will then `close' the trap.
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
 -  echo >&5
 -  echo "## ----------------- ##" >&5
 -  echo "## Cache variables.  ##" >&5
 -  echo "## ----------------- ##" >&5
 -  echo >&5
 -  # The following way of writing the cache mishandles newlines in values,
 +  {
 +    echo
 +
 +    cat <<\_ASBOX
 +## ---------------- ##
 +## Cache variables. ##
 +## ---------------- ##
 +_ASBOX
 +    echo
 +    # The following way of writing the cache mishandles newlines in values,
  {
    (set) 2>&1 |
      case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
      *ac_space=\ *)
        sed -n \
 -        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
 -    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
 +	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
 +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
        ;;
      *)
        sed -n \
 -        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
        ;;
      esac;
 -} >&5
 -  sed "/^$/d" confdefs.h >conftest.log
 -  if test -s conftest.log; then
 -    echo >&5
 -    echo "## ------------ ##" >&5
 -    echo "## confdefs.h.  ##" >&5
 -    echo "## ------------ ##" >&5
 -    echo >&5
 -    cat conftest.log >&5
 -  fi
 -  (echo; echo) >&5
 -  test "$ac_signal" != 0 &&
 -    echo "$as_me: caught signal $ac_signal" >&5
 -  echo "$as_me: exit $exit_status" >&5
 -  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
 +}
 +    echo
 +
 +    cat <<\_ASBOX
 +## ----------------- ##
 +## Output variables. ##
 +## ----------------- ##
 +_ASBOX
 +    echo
 +    for ac_var in $ac_subst_vars
 +    do
 +      eval ac_val=$`echo $ac_var`
 +      echo "$ac_var='"'"'$ac_val'"'"'"
 +    done | sort
 +    echo
 +
 +    if test -n "$ac_subst_files"; then
 +      cat <<\_ASBOX
 +## ------------- ##
 +## Output files. ##
 +## ------------- ##
 +_ASBOX
 +      echo
 +      for ac_var in $ac_subst_files
 +      do
 +	eval ac_val=$`echo $ac_var`
 +	echo "$ac_var='"'"'$ac_val'"'"'"
 +      done | sort
 +      echo
 +    fi
 +
 +    if test -s confdefs.h; then
 +      cat <<\_ASBOX
 +## ----------- ##
 +## confdefs.h. ##
 +## ----------- ##
 +_ASBOX
 +      echo
 +      sed "/^$/d" confdefs.h | sort
 +      echo
 +    fi
 +    test "$ac_signal" != 0 &&
 +      echo "$as_me: caught signal $ac_signal"
 +    echo "$as_me: exit $exit_status"
 +  } >&5
 +  rm -f core *.core &&
 +  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
       ' 0
  for ac_signal in 1 2 13 15; do
 @@ -847,6 +1153,33 @@
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
  echo >confdefs.h

 +# Predefined preprocessor variables.
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_NAME "$PACKAGE_NAME"
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_STRING "$PACKAGE_STRING"
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 +_ACEOF
 +
 +
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
 @@ -858,9 +1191,9 @@
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
 -    { echo "$as_me:861: loading site script $ac_site_file" >&5
 +    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
 -    cat "$ac_site_file" >&5
 +    sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
  done
 @@ -869,7 +1202,7 @@
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
    if test -f "$cache_file"; then
 -    { echo "$as_me:872: loading cache $cache_file" >&5
 +    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . $cache_file;;
 @@ -877,7 +1210,7 @@
      esac
    fi
  else
 -  { echo "$as_me:880: creating cache $cache_file" >&5
 +  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
  echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
 @@ -886,49 +1219,49 @@
  # value.
  ac_cache_corrupted=false
  for ac_var in `(set) 2>&1 |
 -               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
 +	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
    eval ac_old_set=\$ac_cv_env_${ac_var}_set
    eval ac_new_set=\$ac_env_${ac_var}_set
    eval ac_old_val="\$ac_cv_env_${ac_var}_value"
    eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
 -      { echo "$as_me:896: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 +      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
 -      { echo "$as_me:900: error: \`$ac_var' was not set in the previous run" >&5
 +      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
  echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
 -        { echo "$as_me:906: error: \`$ac_var' has changed since the previous run:" >&5
 +	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 -        { echo "$as_me:908:   former value:  $ac_old_val" >&5
 +	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
  echo "$as_me:   former value:  $ac_old_val" >&2;}
 -        { echo "$as_me:910:   current value: $ac_new_val" >&5
 +	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
  echo "$as_me:   current value: $ac_new_val" >&2;}
 -        ac_cache_corrupted=:
 +	ac_cache_corrupted=:
        fi;;
    esac
 -  # Pass precious variables to config.status.  It doesn't matter if
 -  # we pass some twice (in addition to the command line arguments).
 +  # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
      *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
 -      ac_configure_args="$ac_configure_args '$ac_arg'"
 -      ;;
 -    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
 -       ;;
 +      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *) ac_arg=$ac_var=$ac_new_val ;;
 +    esac
 +    case " $ac_configure_args " in
 +      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 +      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
      esac
    fi
  done
  if $ac_cache_corrupted; then
 -  { echo "$as_me:929: error: changes in the environment can compromise the build" >&5
 +  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 -  { { echo "$as_me:931: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 +  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
     { (exit 1); exit 1; }; }
  fi
 @@ -939,30 +1272,36 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu

 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 -  *c*,-n*) ECHO_N= ECHO_C='
 -' ECHO_T='	' ;;
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
 -esac
 -echo "#! $SHELL" >conftest.sh
 -echo  "exit 0"   >>conftest.sh
 -chmod +x conftest.sh
 -if { (echo "$as_me:951: PATH=\".;.\"; conftest.sh") >&5
 -  (PATH=".;."; conftest.sh) 2>&5
 -  ac_status=$?
 -  echo "$as_me:954: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 -  ac_path_separator=';'
 -else
 -  ac_path_separator=:
 -fi
 -PATH_SEPARATOR="$ac_path_separator"
 -rm -f conftest.sh

 -ac_config_headers="$ac_config_headers nbtool_config.h"

 -ac_config_files="$ac_config_files defs.mk"
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +          ac_config_headers="$ac_config_headers nbtool_config.h"
 +
 +          ac_config_files="$ac_config_files defs.mk"
 +

  # AC_NETBSD

 @@ -974,7 +1313,7 @@
  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:977: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -982,25 +1321,28 @@
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_CC="${ac_tool_prefix}gcc"
 -echo "$as_me:992: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="${ac_tool_prefix}gcc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1000: result: $CC" >&5
 +  echo "$as_me:$LINENO: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1003: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1009,7 +1351,7 @@
    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:1012: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1017,25 +1359,28 @@
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_ac_ct_CC="gcc"
 -echo "$as_me:1027: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CC="gcc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1035: result: $ac_ct_CC" >&5
 +  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1038: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1048,7 +1393,7 @@
    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:1051: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1056,25 +1401,28 @@
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_CC="${ac_tool_prefix}cc"
 -echo "$as_me:1066: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="${ac_tool_prefix}cc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1074: result: $CC" >&5
 +  echo "$as_me:$LINENO: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1077: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1083,7 +1431,7 @@
    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:1086: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1091,25 +1439,28 @@
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_ac_ct_CC="cc"
 -echo "$as_me:1101: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CC="cc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1109: result: $ac_ct_CC" >&5
 +  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1112: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1122,7 +1473,7 @@
  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:1125: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1131,19 +1482,22 @@
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
    ac_prog_rejected=no
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
 -  ac_prog_rejected=yes
 -  continue
 -fi
 -ac_cv_prog_CC="cc"
 -echo "$as_me:1145: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 +       ac_prog_rejected=yes
 +       continue
 +     fi
 +    ac_cv_prog_CC="cc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  if test $ac_prog_rejected = yes; then
 @@ -1155,19 +1509,17 @@
      # However, it has the same basename, so the bogon will be chosen
      # first if we set CC to just the basename; use the full file name.
      shift
 -    set dummy "$ac_dir/$ac_word" ${1+"$@"}
 -    shift
 -    ac_cv_prog_CC="$@"
 +    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
    fi
  fi
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1167: result: $CC" >&5
 +  echo "$as_me:$LINENO: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1170: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1178,7 +1530,7 @@
    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:1181: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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,25 +1538,28 @@
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 -echo "$as_me:1196: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
 -  echo "$as_me:1204: result: $CC" >&5
 +  echo "$as_me:$LINENO: result: $CC" >&5
  echo "${ECHO_T}$CC" >&6
  else
 -  echo "$as_me:1207: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1217,7 +1572,7 @@
  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:1220: checking for $ac_word" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1225,25 +1580,28 @@
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  else
 -  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=.
 -  $as_executable_p "$ac_dir/$ac_word" || continue
 -ac_cv_prog_ac_ct_CC="$ac_prog"
 -echo "$as_me:1235: found $ac_dir/$ac_word" >&5
 -break
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CC="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:1243: result: $ac_ct_CC" >&5
 +  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  echo "${ECHO_T}$ac_ct_CC" >&6
  else
 -  echo "$as_me:1246: result: no" >&5
 +  echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
  fi

 @@ -1255,33 +1613,39 @@

  fi

 -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;}
 +
 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: no acceptable C compiler found in \$PATH
 +See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }

  # Provide some information about the compiler.
 -echo "$as_me:1263:" \
 +echo "$as_me:$LINENO:" \
       "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:1266: \"$ac_compiler --version </dev/null >&5\"") >&5
 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
    (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1269: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1271: \"$ac_compiler -v </dev/null >&5\"") >&5
 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
    (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1274: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:1276: \"$ac_compiler -V </dev/null >&5\"") >&5
 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
    (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
 -  echo "$as_me:1279: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }

  cat >conftest.$ac_ext <<_ACEOF
 -#line 1283 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  int
  main ()
 @@ -1292,127 +1656,152 @@
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
 -ac_clean_files="$ac_clean_files a.out a.exe"
 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
  # 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:1299: checking for C compiler default output" >&5
 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 -if { (eval echo "$as_me:1302: \"$ac_link_default\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
 -  echo "$as_me:1305: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
  # resort.
 -for ac_file in `ls a.exe conftest.exe 2>/dev/null;
 -                ls a.out conftest 2>/dev/null;
 -                ls a.* conftest.* 2>/dev/null`; do
 +
 +# Be careful to initialize this variable, since it used to be cached.
 +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
 +ac_cv_exeext=
 +# b.out is created by i960 compilers.
 +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 +do
 +  test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
 -    a.out ) # We found the default executable, but exeext='' is most
 -            # certainly right.
 -            break;;
 -    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
 -          export ac_cv_exeext
 -          break;;
 -    * ) break;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
 +	;;
 +    conftest.$ac_ext )
 +	# This is the source file.
 +	;;
 +    [ab].out )
 +	# We found the default executable, but exeext='' is most
 +	# certainly right.
 +	break;;
 +    *.* )
 +	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 +	# FIXME: I believe we export ac_cv_exeext for Libtool,
 +	# but it would be cool to find out if it's true.  Does anybody
 +	# maintain Libtool? --akim.
 +	export ac_cv_exeext
 +	break;;
 +    * )
 +	break;;
    esac
  done
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1328: error: C compiler cannot create executables" >&5
 -echo "$as_me: error: C compiler cannot create executables" >&2;}
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C compiler cannot create executables
 +See \`config.log' for more details." >&2;}
     { (exit 77); exit 77; }; }
  fi

  ac_exeext=$ac_cv_exeext
 -echo "$as_me:1334: result: $ac_file" >&5
 +echo "$as_me:$LINENO: 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:1339: checking whether the C compiler works" >&5
 +echo "$as_me:$LINENO: 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:1345: \"$ac_try\"") >&5
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1348: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
      cross_compiling=no
    else
      if test "$cross_compiling" = maybe; then
  	cross_compiling=yes
      else
 -	{ { echo "$as_me:1355: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'." >&5
 +	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
 +If you meant to cross compile, use \`--host'.
 +See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'." >&2;}
 +If you meant to cross compile, use \`--host'.
 +See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
      fi
    fi
  fi
 -echo "$as_me:1363: result: yes" >&5
 +echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6

 -rm -f a.out a.exe conftest$ac_cv_exeext
 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
  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:1370: checking whether we are cross compiling" >&5
 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
  echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:1372: result: $cross_compiling" >&5
 +echo "$as_me:$LINENO: result: $cross_compiling" >&5
  echo "${ECHO_T}$cross_compiling" >&6

 -echo "$as_me:1375: checking for executable suffix" >&5
 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
 -if { (eval echo "$as_me:1377: \"$ac_link\"") >&5
 +echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:1380: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
  # work properly (i.e., refer to `conftest.exe'), while it won't with
  # `rm'.
 -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
 +for ac_file in conftest.exe conftest conftest.*; do
 +  test -f "$ac_file" || continue
    case $ac_file in
 -    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -          export ac_cv_exeext
 -          break;;
 +	  export ac_cv_exeext
 +	  break;;
      * ) break;;
    esac
  done
  else
 -  { { 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;}
 +  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi

  rm -f conftest$ac_cv_exeext
 -echo "$as_me:1402: result: $ac_cv_exeext" >&5
 +echo "$as_me:$LINENO: 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:1408: checking for object suffix" >&5
 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +echo $ECHO_N "checking for suffix of object files... $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 1414 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  int
  main ()
 @@ -1423,40 +1812,46 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
 -if { (eval echo "$as_me:1426: \"$ac_compile\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
 -  echo "$as_me:1429: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
  done
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -{ { echo "$as_me:1441: error: cannot compute OBJEXT: cannot compile" >&5
 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
 +See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi

  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
 -echo "$as_me:1448: result: $ac_cv_objext" >&5
 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
  echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
 -echo "$as_me:1452: checking whether we are using the GNU C compiler" >&5
 +echo "$as_me:$LINENO: 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 1458 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  int
  main ()
 @@ -1470,41 +1865,55 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1473: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1476: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1479: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1482: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_compiler_gnu=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu

  fi
 -echo "$as_me:1494: result: $ac_cv_c_compiler_gnu" >&5
 +echo "$as_me:$LINENO: 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:1500: checking whether $CC accepts -g" >&5
 +echo "$as_me:$LINENO: 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 1506 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  int
  main ()
 @@ -1515,26 +1924,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1518: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1521: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1524: \"$ac_try\"") >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1527: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_prog_cc_g=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:1537: result: $ac_cv_prog_cc_g" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1551,6 +1971,121 @@
      CFLAGS=
    fi
  fi
 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 +if test "${ac_cv_prog_cc_stdc+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  ac_cv_prog_cc_stdc=no
 +ac_save_CC=$CC
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <stdarg.h>
 +#include <stdio.h>
 +#include <sys/types.h>
 +#include <sys/stat.h>
 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 +struct buf { int x; };
 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
 +static char *e (p, i)
 +     char **p;
 +     int i;
 +{
 +  return p[i];
 +}
 +static char *f (char * (*g) (char **, int), char **p, ...)
 +{
 +  char *s;
 +  va_list v;
 +  va_start (v,p);
 +  s = g (p, va_arg (v,int));
 +  va_end (v);
 +  return s;
 +}
 +
 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
 +   function prototypes and stuff, but not '\xHH' hex character constants.
 +   These don't provoke an error unfortunately, instead are silently treated
 +   as 'x'.  The following induces an error, until -std1 is added to get
 +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
 +   array size at least.  It's necessary to write '\x00'==0 to get something
 +   that's true only with -std1.  */
 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 +
 +int test (int i, double x);
 +struct s1 {int (*f) (int a);};
 +struct s2 {int (*f) (double a);};
 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 +int argc;
 +char **argv;
 +int
 +main ()
 +{
 +return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +# Don't try gcc -ansi; that turns off useful extensions and
 +# breaks some systems' header files.
 +# AIX			-qlanglvl=ansi
 +# Ultrix and OSF/1	-std1
 +# HP-UX 10.20 and later	-Ae
 +# HP-UX older versions	-Aa -D_HPUX_SOURCE
 +# SVR4			-Xc -D__EXTENSIONS__
 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 +do
 +  CC="$ac_save_CC $ac_arg"
 +  rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_prog_cc_stdc=$ac_arg
 +break
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +fi
 +rm -f conftest.err conftest.$ac_objext
 +done
 +rm -f conftest.$ac_ext conftest.$ac_objext
 +CC=$ac_save_CC
 +
 +fi
 +
 +case "x$ac_cv_prog_cc_stdc" in
 +  x|xno)
 +    echo "$as_me:$LINENO: result: none needed" >&5
 +echo "${ECHO_T}none needed" >&6 ;;
 +  *)
 +    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 +    CC="$CC $ac_cv_prog_cc_stdc" ;;
 +esac
 +
  # Some people use a C++ compiler to compile C.  Since we use `exit',
  # in C++ we need to declare it.  In case someone uses the same compiler
  # for both compiling C and C++ we need to have the C++ compiler decide
 @@ -1561,20 +2096,29 @@
  #endif
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1564: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1567: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1570: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1573: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    for ac_declaration in \
 -   ''\
 -   '#include <stdlib.h>' \
 +   '' \
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
 @@ -1582,10 +2126,13 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1585 "configure"
 -#include "confdefs.h"
 -#include <stdlib.h>
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_declaration
 +#include <stdlib.h>
  int
  main ()
  {
 @@ -1595,27 +2142,41 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1598: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1601: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1604: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1607: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  continue
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1617 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_declaration
  int
  main ()
 @@ -1626,23 +2187,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1629: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1632: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1635: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1638: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    break
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  rm -f conftest*
  if test -n "$ac_declaration"; then
 @@ -1653,21 +2225,23 @@

  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  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

 +
  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:1670: checking how to run the C preprocessor" >&5
 +echo "$as_me:$LINENO: 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
 @@ -1685,24 +2259,34 @@
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
    # 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 1691 "configure"
 -#include "confdefs.h"
 -#include <assert.h>
 -                     Syntax error
 +/* confdefs.h.  */
  _ACEOF
 -if { (eval echo "$as_me:1696: \"$ac_cpp conftest.$ac_ext\"") >&5
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +		     Syntax error
 +_ACEOF
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:1702: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -1713,7 +2297,8 @@
    :
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
    # Broken: fails on valid input.
  continue
  fi
 @@ -1722,20 +2307,24 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1725 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:1735: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -1747,7 +2336,8 @@
  continue
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
    # Passes both tests.
  ac_preproc_ok=:
  break
 @@ -1769,31 +2359,41 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
 -echo "$as_me:1772: result: $CPP" >&5
 +echo "$as_me:$LINENO: result: $CPP" >&5
  echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
    # Use a header file that comes with gcc, so configuring glibc
    # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
    # 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 1782 "configure"
 -#include "confdefs.h"
 -#include <assert.h>
 -                     Syntax error
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +		     Syntax error
  _ACEOF
 -if { (eval echo "$as_me:1787: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:1793: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -1804,7 +2404,8 @@
    :
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
    # Broken: fails on valid input.
  continue
  fi
 @@ -1813,20 +2414,24 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
 -#line 1816 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
 -if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:1826: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -1838,7 +2443,8 @@
  continue
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
    # Passes both tests.
  ac_preproc_ok=:
  break
 @@ -1851,8 +2457,10 @@
  if $ac_preproc_ok; then
    :
  else
 -  { { echo "$as_me:1854: error: C preprocessor \"$CPP\" fails sanity check" >&5
 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
 +  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi

 @@ -1862,39 +2470,59 @@
  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:1865: checking for NetBSD" >&5
 +
 +echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 +if test "${ac_cv_prog_egrep+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
 +    then ac_cv_prog_egrep='grep -E'
 +    else ac_cv_prog_egrep='egrep'
 +    fi
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6
 + EGREP=$ac_cv_prog_egrep
 +
 +
 +            echo "$as_me:$LINENO: checking for NetBSD" >&5
  echo $ECHO_N "checking for NetBSD... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
 -#line 1868 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end 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
 +  $EGREP "yes" >/dev/null 2>&1; then
 +  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
 -	cat >>confdefs.h <<\EOF
 +	cat >>confdefs.h <<\_ACEOF
  #define _POSIX_SOURCE 1
 -EOF
 - cat >>confdefs.h <<\EOF
 +_ACEOF
 + cat >>confdefs.h <<\_ACEOF
  #define _POSIX_C_SOURCE 200112L
 -EOF
 - cat >>confdefs.h <<\EOF
 +_ACEOF
 + cat >>confdefs.h <<\_ACEOF
  #define _XOPEN_SOURCE 600
 -EOF
 +_ACEOF

  else
 -  echo "$as_me:1890: result: no" >&5
 +  echo "$as_me:$LINENO: 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 "$as_me:$LINENO: 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
 @@ -1904,16 +2532,18 @@
    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
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_path_BSHELL="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
  done

    ;;
 @@ -1922,32 +2552,35 @@
  BSHELL=$ac_cv_path_BSHELL

  if test -n "$BSHELL"; then
 -  echo "$as_me:1925: result: $BSHELL" >&5
 +  echo "$as_me:$LINENO: result: $BSHELL" >&5
  echo "${ECHO_T}$BSHELL" >&6
  else
 -  echo "$as_me:1928: result: no" >&5
 +  echo "$as_me:$LINENO: 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:$LINENO: 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
 +cat >>confdefs.h <<_ACEOF
  #define PATH_BSHELL "$BSHELL"
 -EOF
 +_ACEOF
 +

 -echo "$as_me:1941: checking whether byte ordering is bigendian" >&5
 +echo "$as_me:$LINENO: 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.
 +  # See if sys/param.h defines the BYTE_ORDER macro.
  cat >conftest.$ac_ext <<_ACEOF
 -#line 1949 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/param.h>

 @@ -1963,21 +2596,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1966: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1969: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:1972: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:1975: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/param.h>

 @@ -1993,38 +2639,109 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:1996: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:1999: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2002: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2005: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_c_bigendian=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err 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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +# It does not; compile a test program.
  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; }; }
 +  # try to guess the endianness by grepping values into an object file
 +  ac_cv_c_bigendian=unknown
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
 +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
 +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
 +int
 +main ()
 +{
 + _ascii (); _ebcdic ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
 +  ac_cv_c_bigendian=yes
 +fi
 +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
 +  if test "$ac_cv_c_bigendian" = unknown; then
 +    ac_cv_c_bigendian=no
 +  else
 +    # finding both strings is unlikely to happen, but who knows?
 +    ac_cv_c_bigendian=unknown
 +  fi
 +fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2026 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  int
  main ()
  {
 @@ -2039,86 +2756,117 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:2042: \"$ac_link\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:2045: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:2047: \"$ac_try\"") >&5
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2050: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2063: result: $ac_cv_c_bigendian" >&5
 +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
  echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 -if test $ac_cv_c_bigendian = yes; then
 +case $ac_cv_c_bigendian in
 +  yes)

 -cat >>confdefs.h <<\EOF
 +cat >>confdefs.h <<\_ACEOF
  #define WORDS_BIGENDIAN 1
 -EOF
 -
 -fi
 +_ACEOF
 + ;;
 +  no)
 +     ;;
 +  *)
 +    { { echo "$as_me:$LINENO: error: unknown endianness
 +presetting ac_cv_c_bigendian=no (or yes) will help" >&5
 +echo "$as_me: error: unknown endianness
 +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 +   { (exit 1); exit 1; }; } ;;
 +esac

 -echo "$as_me:2073: checking for ANSI C header files" >&5
 +echo "$as_me:$LINENO: 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 2079 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>

 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
  _ACEOF
 -if { (eval echo "$as_me:2087: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&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
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  ac_cv_header_stdc=no
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_cv_header_stdc=no
  fi
 -rm -f conftest.err conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext 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 2115 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <string.h>

  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "memchr" >/dev/null 2>&1; then
 +  $EGREP "memchr" >/dev/null 2>&1; then
    :
  else
    ac_cv_header_stdc=no
 @@ -2130,13 +2878,16 @@
  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 2133 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <stdlib.h>

  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "free" >/dev/null 2>&1; then
 +  $EGREP "free" >/dev/null 2>&1; then
    :
  else
    ac_cv_header_stdc=no
 @@ -2151,16 +2902,20 @@
    :
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 2154 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <ctype.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
  #else
 -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
 -                     || ('j' <= (c) && (c) <= 'r') \
 -                     || ('s' <= (c) && (c) <= 'z'))
 +# define ISLOWER(c) \
 +		   (('a' <= (c) && (c) <= 'i') \
 +		     || ('j' <= (c) && (c) <= 'r') \
 +		     || ('s' <= (c) && (c) <= 'z'))
  # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
  #endif

 @@ -2171,103 +2926,283 @@
    int i;
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
 -        || toupper (i) != TOUPPER (i))
 +	|| toupper (i) != TOUPPER (i))
        exit(2);
    exit (0);
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:2180: \"$ac_link\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:2183: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:2185: \"$ac_try\"") >&5
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2188: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    :
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
  ac_cv_header_stdc=no
  fi
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  fi
 -echo "$as_me:2201: result: $ac_cv_header_stdc" >&5
 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
  echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then

 -cat >>confdefs.h <<\EOF
 +cat >>confdefs.h <<\_ACEOF
  #define STDC_HEADERS 1
 -EOF
 +_ACEOF

  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: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
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +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:$LINENO: 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 2220 "configure"
 -#include "confdefs.h"
 -#include <zlib.h>
 +/* confdefs.h.  */
  _ACEOF
 -if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&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
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
 -  ac_cv_header_zlib_h=yes
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  ac_cv_header_zlib_h=no
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +eval "$as_ac_Header=no"
  fi
 -rm -f conftest.err conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -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: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; }; }
 +echo "$as_me:$LINENO: 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 <<_ACEOF
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
  fi

 -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
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lz  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -#line 2267 "configure"
 -#include "confdefs.h"
 +done

 -/* Override any gcc2 internal prototype to avoid an error.  */
 +
 +if test "${ac_cv_header_zlib_h+set}" = set; then
 +  echo "$as_me:$LINENO: 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
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 +else
 +  # Is the header compilable?
 +echo "$as_me:$LINENO: checking zlib.h usability" >&5
 +echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <zlib.h>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_header_compiler=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +# Is the header present?
 +echo "$as_me:$LINENO: checking zlib.h presence" >&5
 +echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <zlib.h>
 +_ACEOF
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 +  else
 +    ac_cpp_err=
 +  fi
 +else
 +  ac_cpp_err=yes
 +fi
 +if test -z "$ac_cpp_err"; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
 +fi
 +rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
 +    (
 +      cat <<\_ASBOX
 +## ---------------------------------------- ##
 +## Report this to lib-bug-people@NetBSD.org ##
 +## ---------------------------------------- ##
 +_ASBOX
 +    ) |
 +      sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +echo "$as_me:$LINENO: 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
 +  ac_cv_header_zlib_h=$ac_header_preproc
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
 +
 +fi
 +if test $ac_cv_header_zlib_h = yes; then
 +  :
 +else
 +  { { echo "$as_me:$LINENO: 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:$LINENO: 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
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lz  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
 +/* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
 @@ -2283,45 +3218,83 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:2286: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2289: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:2292: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2295: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_z_gzdopen=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_lib_z_gzdopen=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:2306: result: $ac_cv_lib_z_gzdopen" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
 -EOF
 +_ACEOF

    LIBS="-lz $LIBS"

  else
 -  { { echo "$as_me:2316: error: zlib must be installed in a compiler-visible path" >&5
 +  { { echo "$as_me:$LINENO: 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

 +
  # Make sure certain required headers are available.
  # These are not necessarily required by the code, but they are not
  # currently conditionalized.

 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  for ac_header in sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
  	sys/socket.h sys/stat.h sys/time.h sys/types.h sys/utsname.h \
  	sys/wait.h assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
 @@ -2329,26 +3302,82 @@
  	termios.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 -echo "$as_me:2332: checking for $ac_header" >&5
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +  echo "$as_me:$LINENO: 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
 +fi
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 2338 "configure"
 -#include "confdefs.h"
 +  # Is the header compilable?
 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_header_compiler=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +# Is the header present?
 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:2342: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:2348: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -2356,41 +3385,94 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
 -  eval "$as_ac_Header=yes"
 +  ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  eval "$as_ac_Header=no"
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    (
 +      cat <<\_ASBOX
 +## ---------------------------------------- ##
 +## Report this to lib-bug-people@NetBSD.org ##
 +## ---------------------------------------- ##
 +_ASBOX
 +    ) |
 +      sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +echo "$as_me:$LINENO: 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
 +  eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:2367: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +
 +fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:2375: error: standard system header file not found" >&5
 +  { { echo "$as_me:$LINENO: error: standard system header file not found" >&5
  echo "$as_me: error: standard system header file not found" >&2;}
     { (exit 1); exit 1; }; }
  fi
 +
  done

 +
  # Find headers that may not be available.

 +
 +
 +
 +
  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:2386: checking for $ac_hdr that defines DIR" >&5
 +echo "$as_me:$LINENO: 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 2392 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <$ac_hdr>

 @@ -2404,31 +3486,42 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2407: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2410: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2413: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2416: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  eval "$as_ac_Header=no"
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2426: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  ac_header_dirent=$ac_hdr; break
  fi
 @@ -2436,16 +3529,19 @@
  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: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 "$as_me:$LINENO: checking for library containing opendir" >&5
 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
 +if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-ldir  $LIBS"
 +  ac_func_search_save_LIBS=$LIBS
 +ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
 -#line 2447 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
 @@ -2463,43 +3559,116 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:2466: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2469: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:2472: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2475: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_lib_dir_opendir=yes
 +  ac_cv_search_opendir="none required"
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -ac_cv_lib_dir_opendir=no
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test "$ac_cv_search_opendir" = no; then
 +  for ac_lib in dir; do
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +    cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.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 opendir ();
 +int
 +main ()
 +{
 +opendir ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_search_opendir="-l$ac_lib"
 +break
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +  done
 +fi
 +LIBS=$ac_func_search_save_LIBS
  fi
 -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"
 +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 +echo "${ECHO_T}$ac_cv_search_opendir" >&6
 +if test "$ac_cv_search_opendir" != no; then
 +  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
 +
  fi

  else
 -  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 "$as_me:$LINENO: checking for library containing opendir" >&5
 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
 +if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lx  $LIBS"
 +  ac_func_search_save_LIBS=$LIBS
 +ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
 -#line 2501 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
 @@ -2517,58 +3686,191 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:2520: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2523: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:2526: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2529: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_lib_x_opendir=yes
 +  ac_cv_search_opendir="none required"
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -ac_cv_lib_x_opendir=no
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test "$ac_cv_search_opendir" = no; then
 +  for ac_lib in x; do
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +    cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.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 opendir ();
 +int
 +main ()
 +{
 +opendir ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_search_opendir="-l$ac_lib"
 +break
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -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"
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +  done
 +fi
 +LIBS=$ac_func_search_save_LIBS
  fi
 +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 +echo "${ECHO_T}$ac_cv_search_opendir" >&6
 +if test "$ac_cv_search_opendir" != no; then
 +  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"

  fi

 +fi
 +
 +
 +
 +
 +
 +
 +
 +
  for ac_header in sys/sysmacros.h sys/syslimits.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:2552: checking for $ac_header" >&5
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +  echo "$as_me:$LINENO: 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
 +fi
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 2558 "configure"
 -#include "confdefs.h"
 +  # Is the header compilable?
 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_header_compiler=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +# Is the header present?
 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:2562: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:2568: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -2576,48 +3878,159 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
 -  eval "$as_ac_Header=yes"
 +  ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  eval "$as_ac_Header=no"
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    (
 +      cat <<\_ASBOX
 +## ---------------------------------------- ##
 +## Report this to lib-bug-people@NetBSD.org ##
 +## ---------------------------------------- ##
 +_ASBOX
 +    ) |
 +      sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +echo "$as_me:$LINENO: 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
 +  eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:2587: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +
 +fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  fi
 +
  done

 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  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:2601: checking for $ac_header" >&5
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +  echo "$as_me:$LINENO: 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
 +fi
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 2607 "configure"
 -#include "confdefs.h"
 +  # Is the header compilable?
 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_header_compiler=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +# Is the header present?
 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:2611: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:2617: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -2625,49 +4038,152 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
 -  eval "$as_ac_Header=yes"
 +  ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  eval "$as_ac_Header=no"
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    (
 +      cat <<\_ASBOX
 +## ---------------------------------------- ##
 +## Report this to lib-bug-people@NetBSD.org ##
 +## ---------------------------------------- ##
 +_ASBOX
 +    ) |
 +      sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +echo "$as_me:$LINENO: 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
 +  eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:2636: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +
 +fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  else
    test -f include/$ac_header || touch include/$ac_header
  fi
 +
  done

 +
 +
  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:2651: checking for $ac_header" >&5
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +  echo "$as_me:$LINENO: 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
 +fi
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -#line 2657 "configure"
 -#include "confdefs.h"
 +  # Is the header compilable?
 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_header_compiler=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +# Is the header present?
 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
 -if { (eval echo "$as_me:2661: \"$ac_cpp conftest.$ac_ext\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 +  grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
 -  echo "$as_me:2667: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    else
      ac_cpp_err=
    fi
 @@ -2675,20 +4191,64 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
 -  eval "$as_ac_Header=yes"
 +  ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  eval "$as_ac_Header=no"
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 +    ac_header_preproc=yes
 +    ;;
 +  no:yes:* )
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 +echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 +echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 +    (
 +      cat <<\_ASBOX
 +## ---------------------------------------- ##
 +## Report this to lib-bug-people@NetBSD.org ##
 +## ---------------------------------------- ##
 +_ASBOX
 +    ) |
 +      sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +echo "$as_me:$LINENO: 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
 +  eval "$as_ac_Header=\$ac_header_preproc"
  fi
 -echo "$as_me:2686: result: `eval echo '${'$as_ac_Header'}'`" >&5
 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +
 +fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  else
    echo '#include "nbtool_config.h"' >include/$ac_header.new
 @@ -2699,64 +4259,22 @@
  		mv -f include/$ac_header.new include/$ac_header
  	fi
  fi
 -done
 -
 -# Typedefs.
 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.

 -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: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 2717 "configure"
 -#include "confdefs.h"
 -$ac_includes_default
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2723: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
 -  echo "$as_me:2726: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2729: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:2732: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  eval "$as_ac_Header=yes"
 -else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -eval "$as_ac_Header=no"
 -fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -fi
 -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
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -EOF
 -
 -fi
  done

 -echo "$as_me:2752: checking for size_t" >&5
 +
 +# Typedefs.
 +echo "$as_me:$LINENO: 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 2758 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -2770,45 +4288,59 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2773: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2776: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2779: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2782: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_size_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_size_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2792: result: $ac_cv_type_size_t" >&5
 +echo "$as_me:$LINENO: 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
    :
  else

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define size_t unsigned
 -EOF
 +_ACEOF

  fi

 -echo "$as_me:2804: checking for id_t" >&5
 +echo "$as_me:$LINENO: 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 2810 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -2822,42 +4354,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2825: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2828: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2831: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2834: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_id_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_id_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2844: result: $ac_cv_type_id_t" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_ID_T 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:2853: checking for long long" >&5
 +echo "$as_me:$LINENO: 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 2859 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -2871,42 +4418,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2874: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2877: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2880: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2883: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_long_long=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_long_long=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2893: result: $ac_cv_type_long_long" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_LONG_LONG 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:2902: checking for u_long" >&5
 +echo "$as_me:$LINENO: 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 2908 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -2920,42 +4482,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2923: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2926: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2929: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2932: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_long=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_long=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2942: result: $ac_cv_type_u_long" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_U_LONG 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:2951: checking for u_char" >&5
 +echo "$as_me:$LINENO: 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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -2969,42 +4546,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:2972: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:2975: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:2978: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:2981: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_char=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:2991: result: $ac_cv_type_u_char" >&5
 +echo "$as_me:$LINENO: 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
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_U_CHAR 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:3000: checking for u_short" >&5
 +echo "$as_me:$LINENO: 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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3018,42 +4610,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3021: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3024: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3027: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3030: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_short=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3040: result: $ac_cv_type_u_short" >&5
 +echo "$as_me:$LINENO: 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
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_U_SHORT 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:3049: checking for u_int" >&5
 +echo "$as_me:$LINENO: 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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3067,42 +4674,57 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3070: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3073: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3076: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3079: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3089: result: $ac_cv_type_u_int" >&5
 +echo "$as_me:$LINENO: 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
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_U_INT 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:3098: checking for u_quad_t" >&5
 +echo "$as_me:$LINENO: 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 3104 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3116,43 +4738,58 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3119: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3122: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3125: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3128: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_quad_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_quad_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3138: result: $ac_cv_type_u_quad_t" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_U_QUAD_T 1
 -EOF
 +_ACEOF
 +

  fi

 -echo "$as_me:3148: checking for socklen_t" >&5
 +echo "$as_me:$LINENO: 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 3154 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/socket.h>

 @@ -3168,42 +4805,60 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3171: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3174: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3177: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3180: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_socklen_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_socklen_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3190: result: $ac_cv_type_socklen_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SOCKLEN_T 1
 -EOF
 +_ACEOF

  fi

 -	echo "$as_me:3199: checking for uint8_t" >&5
 +
 +
 +
 +
 +	echo "$as_me:$LINENO: 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 3205 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3217,39 +4872,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3223: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3226: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3229: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint8_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint8_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3239: result: $ac_cv_type_uint8_t" >&5
 +echo "$as_me:$LINENO: 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:3245: checking for u_int8_t" >&5
 +		echo "$as_me:$LINENO: 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 3251 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3263,48 +4932,63 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3266: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3269: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3272: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3275: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int8_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int8_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3285: result: $ac_cv_type_u_int8_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define uint8_t u_int8_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3293: error: cannot find a suitable type for uint8_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3300: checking for u_int8_t" >&5
 +	echo "$as_me:$LINENO: 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 3306 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3318,39 +5002,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3321: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3324: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3327: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3330: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int8_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int8_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3340: result: $ac_cv_type_u_int8_t" >&5
 +echo "$as_me:$LINENO: 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:3346: checking for uint8_t" >&5
 +		echo "$as_me:$LINENO: 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 3352 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3364,48 +5062,65 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3367: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3370: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3373: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3376: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint8_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint8_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3386: result: $ac_cv_type_uint8_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define u_int8_t uint8_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3394: error: cannot find a suitable type for u_int8_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3401: checking for uint16_t" >&5
 +
 +
 +	echo "$as_me:$LINENO: 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 3407 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3419,39 +5134,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3422: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3425: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3428: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3431: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint16_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint16_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3441: result: $ac_cv_type_uint16_t" >&5
 +echo "$as_me:$LINENO: 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:3447: checking for u_int16_t" >&5
 +		echo "$as_me:$LINENO: 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 3453 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3465,48 +5194,63 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3468: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3471: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3474: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3477: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int16_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int16_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3487: result: $ac_cv_type_u_int16_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define uint16_t u_int16_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3495: error: cannot find a suitable type for uint16_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3502: checking for u_int16_t" >&5
 +	echo "$as_me:$LINENO: 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 3508 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3520,39 +5264,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3523: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3526: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3529: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3532: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int16_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int16_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3542: result: $ac_cv_type_u_int16_t" >&5
 +echo "$as_me:$LINENO: 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:3548: checking for uint16_t" >&5
 +		echo "$as_me:$LINENO: 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 3554 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3566,48 +5324,65 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3569: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3572: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3575: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3578: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint16_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint16_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3588: result: $ac_cv_type_uint16_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define u_int16_t uint16_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3596: error: cannot find a suitable type for u_int16_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3603: checking for uint32_t" >&5
 +
 +
 +	echo "$as_me:$LINENO: 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 3609 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3621,39 +5396,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3624: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3627: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3630: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3633: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint32_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint32_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3643: result: $ac_cv_type_uint32_t" >&5
 +echo "$as_me:$LINENO: 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:3649: checking for u_int32_t" >&5
 +		echo "$as_me:$LINENO: 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 3655 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3667,48 +5456,63 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3670: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3673: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3676: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3679: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int32_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int32_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3689: result: $ac_cv_type_u_int32_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define uint32_t u_int32_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3697: error: cannot find a suitable type for uint32_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3704: checking for u_int32_t" >&5
 +	echo "$as_me:$LINENO: 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 3710 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3722,39 +5526,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3725: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3728: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3731: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3734: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int32_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int32_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3744: result: $ac_cv_type_u_int32_t" >&5
 +echo "$as_me:$LINENO: 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:3750: checking for uint32_t" >&5
 +		echo "$as_me:$LINENO: 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 3756 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3768,48 +5586,65 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3771: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3774: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3777: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3780: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint32_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint32_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3790: result: $ac_cv_type_uint32_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define u_int32_t uint32_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3798: error: cannot find a suitable type for u_int32_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3805: checking for uint64_t" >&5
 +
 +
 +	echo "$as_me:$LINENO: 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 3811 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3823,39 +5658,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3826: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3829: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3832: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3835: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint64_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint64_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3845: result: $ac_cv_type_uint64_t" >&5
 +echo "$as_me:$LINENO: 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:3851: checking for u_int64_t" >&5
 +		echo "$as_me:$LINENO: 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 3857 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3869,48 +5718,63 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3872: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3875: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3878: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3881: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int64_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int64_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3891: result: $ac_cv_type_u_int64_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define uint64_t u_int64_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:3899: error: cannot find a suitable type for uint64_t" >&5
 +  { { echo "$as_me:$LINENO: 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:3906: checking for u_int64_t" >&5
 +	echo "$as_me:$LINENO: 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 3912 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3924,39 +5788,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3927: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3930: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3933: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3936: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_u_int64_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_u_int64_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3946: result: $ac_cv_type_u_int64_t" >&5
 +echo "$as_me:$LINENO: 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:3952: checking for uint64_t" >&5
 +		echo "$as_me:$LINENO: 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 3958 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  $ac_includes_default
  int
  main ()
 @@ -3970,49 +5848,66 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:3973: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:3976: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:3979: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:3982: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_type_uint64_t=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_type_uint64_t=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:3992: result: $ac_cv_type_uint64_t" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<\_ACEOF
  #define u_int64_t uint64_t
 -EOF
 +_ACEOF

  else
 -  { { echo "$as_me:4000: error: cannot find a suitable type for u_int64_t" >&5
 +  { { echo "$as_me:$LINENO: 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

 +
  fi

 +
 +
  # Struct members.
 -echo "$as_me:4008: checking for DIR.dd_fd" >&5
 +echo "$as_me:$LINENO: 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 4014 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>

 @@ -4027,42 +5922,151 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4030: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_DIR_dd_fd=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <dirent.h>
 +
 +int
 +main ()
 +{
 +static DIR ac_aggr;
 +if (sizeof ac_aggr.dd_fd)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4033: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4036: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4039: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_DIR_dd_fd=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -ac_cv_member_DIR_dd_fd=no
 -fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 -fi
 -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
 -
 -cat >>confdefs.h <<EOF
 -#define HAVE_DIR_DD_FD 1
 -EOF
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_cv_member_DIR_dd_fd=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: 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
 +
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DIR_DD_FD 1
 +_ACEOF
 +
 +
 +fi
 +echo "$as_me:$LINENO: 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
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <dirent.h>
 +
 +int
 +main ()
 +{
 +static struct dirent ac_aggr;
 +if (ac_aggr.d_namlen)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_dirent_d_namlen=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5

 -fi
 -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 4064 "configure"
 -#include "confdefs.h"
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>

 @@ -4070,50 +6074,67 @@
  main ()
  {
  static struct dirent ac_aggr;
 -if (ac_aggr.d_namlen)
 +if (sizeof ac_aggr.d_namlen)
  return 0;
    ;
    return 0;
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4083: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4086: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4089: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_dirent_d_namlen=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_dirent_d_namlen=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4099: result: $ac_cv_member_struct_dirent_d_namlen" >&5
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_DIRENT_D_NAMLEN 1
 -EOF
 +_ACEOF
 +

  fi

 -echo "$as_me:4109: checking for struct stat.st_flags" >&5
 +echo "$as_me:$LINENO: 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 4115 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/stat.h>

  int
 @@ -4127,42 +6148,104 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4130: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4133: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_stat_st_flags=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
 +
 +int
 +main ()
 +{
 +static struct stat ac_aggr;
 +if (sizeof ac_aggr.st_flags)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4136: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4139: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_stat_st_flags=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_stat_st_flags=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4149: result: $ac_cv_member_struct_stat_st_flags" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_FLAGS 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:4158: checking for struct stat.st_gen" >&5
 +echo "$as_me:$LINENO: 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 4164 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/stat.h>

  int
 @@ -4176,42 +6259,104 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4179: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4182: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_stat_st_gen=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
 +
 +int
 +main ()
 +{
 +static struct stat ac_aggr;
 +if (sizeof ac_aggr.st_gen)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4185: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4188: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_stat_st_gen=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_stat_st_gen=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4198: result: $ac_cv_member_struct_stat_st_gen" >&5
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_GEN 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:4207: checking for struct stat.st_birthtime" >&5
 +echo "$as_me:$LINENO: 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 4213 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/stat.h>

  int
 @@ -4225,42 +6370,104 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4228: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_stat_st_birthtime=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
 +
 +int
 +main ()
 +{
 +static struct stat ac_aggr;
 +if (sizeof ac_aggr.st_birthtime)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4231: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4234: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4237: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_stat_st_birthtime=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_stat_st_birthtime=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4247: result: $ac_cv_member_struct_stat_st_birthtime" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:4256: checking for struct stat.st_atim" >&5
 +echo "$as_me:$LINENO: 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 4262 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/stat.h>

  int
 @@ -4274,42 +6481,104 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4277: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_stat_st_atim=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
 +
 +int
 +main ()
 +{
 +static struct stat ac_aggr;
 +if (sizeof ac_aggr.st_atim)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4280: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4283: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4286: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_stat_st_atim=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_stat_st_atim=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4296: result: $ac_cv_member_struct_stat_st_atim" >&5
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_ATIM 1
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:4305: checking for struct stat.st_mtimensec" >&5
 +echo "$as_me:$LINENO: 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 4311 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/stat.h>

  int
 @@ -4323,43 +6592,105 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_stat_st_mtimensec=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/stat.h>
 +
 +int
 +main ()
 +{
 +static struct stat ac_aggr;
 +if (sizeof ac_aggr.st_mtimensec)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4329: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4335: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_stat_st_mtimensec=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_stat_st_mtimensec=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4345: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
 -EOF
 +_ACEOF
 +

  fi

 -echo "$as_me:4355: checking for struct statvfs.f_iosize" >&5
 +echo "$as_me:$LINENO: checking for struct statvfs.f_iosize" >&5
  echo $ECHO_N "checking for struct statvfs.f_iosize... $ECHO_C" >&6
  if test "${ac_cv_member_struct_statvfs_f_iosize+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4361 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <sys/statvfs.h>

  int
 @@ -4373,49 +6704,113 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4376: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_member_struct_statvfs_f_iosize=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <sys/statvfs.h>
 +
 +int
 +main ()
 +{
 +static struct statvfs ac_aggr;
 +if (sizeof ac_aggr.f_iosize)
 +return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4379: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4382: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4385: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_member_struct_statvfs_f_iosize=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_member_struct_statvfs_f_iosize=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4395: result: $ac_cv_member_struct_statvfs_f_iosize" >&5
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_member_struct_statvfs_f_iosize" >&5
  echo "${ECHO_T}$ac_cv_member_struct_statvfs_f_iosize" >&6
  if test $ac_cv_member_struct_statvfs_f_iosize = yes; then

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STATVFS_F_IOSIZE 1
 -EOF
 +_ACEOF
 +

  fi

 +
  # Global variable decls.
 -echo "$as_me:4406: checking whether optind is declared" >&5
 +echo "$as_me:$LINENO: 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 4412 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>

 +
  int
  main ()
  {
 @@ -4428,52 +6823,69 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4431: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4434: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4437: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4440: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_have_decl_optind=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_have_decl_optind=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4450: result: $ac_cv_have_decl_optind" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_OPTIND 1
 -EOF
 +_ACEOF
 +

  else
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_OPTIND 0
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:4464: checking whether optreset is declared" >&5
 +echo "$as_me:$LINENO: 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 4470 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>

 +
  int
  main ()
  {
 @@ -4486,48 +6898,65 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4489: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4492: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4495: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4498: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_have_decl_optreset=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_have_decl_optreset=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4508: result: $ac_cv_have_decl_optreset" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_OPTRESET 1
 -EOF
 +_ACEOF
 +

  else
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_OPTRESET 0
 -EOF
 +_ACEOF
 +

  fi

 -echo "$as_me:4523: checking whether sys_signame is declared" >&5
 +
 +echo "$as_me:$LINENO: 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 4529 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <signal.h>

  int
 @@ -4542,51 +6971,69 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4548: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4554: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_have_decl_sys_signame=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_have_decl_sys_signame=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:4564: result: $ac_cv_have_decl_sys_signame" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SYS_SIGNAME 1
 -EOF
 +_ACEOF
 +

  else
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SYS_SIGNAME 0
 -EOF
 +_ACEOF
 +

  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:4582: checking for working alloca.h" >&5
 +echo "$as_me:$LINENO: 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 4588 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #include <alloca.h>
  int
  main ()
 @@ -4597,43 +7044,58 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4600: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4603: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4606: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4609: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_working_alloca_h=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_working_alloca_h=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4619: result: $ac_cv_working_alloca_h" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<\EOF
 +cat >>confdefs.h <<\_ACEOF
  #define HAVE_ALLOCA_H 1
 -EOF
 +_ACEOF

  fi

 -echo "$as_me:4629: checking for alloca" >&5
 +echo "$as_me:$LINENO: 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 4635 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #ifdef __GNUC__
  # define alloca __builtin_alloca
  #else
 @@ -4664,33 +7126,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4667: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4670: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4673: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4676: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_func_alloca_works=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_func_alloca_works=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4686: result: $ac_cv_func_alloca_works" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<\EOF
 +cat >>confdefs.h <<\_ACEOF
  #define HAVE_ALLOCA 1
 -EOF
 +_ACEOF

  else
    # The SVR3 libPW and SVR4 libucb both contain incompatible functions
 @@ -4700,18 +7174,22 @@

  ALLOCA=alloca.$ac_objext

 -cat >>confdefs.h <<\EOF
 +cat >>confdefs.h <<\_ACEOF
  #define C_ALLOCA 1
 -EOF
 +_ACEOF
 +

 -echo "$as_me:4707: checking whether \`alloca.c' needs Cray hooks" >&5
 +echo "$as_me:$LINENO: 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 4713 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
  #else
 @@ -4720,7 +7198,7 @@

  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  egrep "webecray" >/dev/null 2>&1; then
 +  $EGREP "webecray" >/dev/null 2>&1; then
    ac_cv_os_cray=yes
  else
    ac_cv_os_cray=no
 @@ -4728,74 +7206,106 @@
  rm -f conftest*

  fi
 -echo "$as_me:4731: result: $ac_cv_os_cray" >&5
 +echo "$as_me:$LINENO: 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:4736: checking for $ac_func" >&5
 +echo "$as_me:$LINENO: 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 4742 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.  */
 -#include <assert.h>
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
 +
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +
 +#undef $ac_func
 +
  /* 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;
 +char (*f) () = $ac_func;
 +#endif
 +#ifdef __cplusplus
 +}
  #endif

 +int
 +main ()
 +{
 +return f != $ac_func;
    ;
    return 0;
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4776: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4779: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4782: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  eval "$as_ac_var=no"
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4792: result: `eval echo '${'$as_ac_var'}'`" >&5
 +echo "$as_me:$LINENO: 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
 +cat >>confdefs.h <<_ACEOF
  #define CRAY_STACKSEG_END $ac_func
 -EOF
 +_ACEOF

      break
  fi
 @@ -4803,7 +7313,7 @@
    done
  fi

 -echo "$as_me:4806: checking stack direction for C alloca" >&5
 +echo "$as_me:$LINENO: 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
 @@ -4812,8 +7322,11 @@
    ac_cv_c_stack_direction=0
  else
    cat >conftest.$ac_ext <<_ACEOF
 -#line 4815 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  int
  find_stack_direction ()
  {
 @@ -4835,35 +7348,80 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:4838: \"$ac_link\"") >&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
 -  echo "$as_me:4841: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 -  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4846: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_c_stack_direction=1
  else
    echo "$as_me: program exited with status $ac_status" >&5
  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
 -echo "$as_me:4858: result: $ac_cv_c_stack_direction" >&5
 +echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
  echo "${ECHO_T}$ac_cv_c_stack_direction" >&6

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
 -EOF
 +_ACEOF
 +

  fi

 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  for ac_func in atoll asprintf asnprintf basename devname dirfd dirname \
  	fgetln flock fparseln futimes getopt getopt_long group_from_gid \
  	isblank issetugid lchflags lchmod lchown lutimes mkstemp mkdtemp \
 @@ -4873,223 +7431,444 @@
  	user_from_uid vasprintf vasnprintf vsnprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:4876: checking for $ac_func" >&5
 +echo "$as_me:$LINENO: 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 4882 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.  */
 -#include <assert.h>
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
 +
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +
 +#undef $ac_func
 +
  /* 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;
 +char (*f) () = $ac_func;
 +#endif
 +#ifdef __cplusplus
 +}
  #endif

 +int
 +main ()
 +{
 +return f != $ac_func;
    ;
    return 0;
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:4913: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4916: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4922: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  eval "$as_ac_var=no"
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:4932: result: `eval echo '${'$as_ac_var'}'`" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  fi
  done

 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  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 "$as_me:$LINENO: 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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.  */
 -#include <assert.h>
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
 +
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +
 +#undef $ac_func
 +
  /* 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) ();
 +/* 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
 +char (*f) () = $ac_func;
 +#endif
 +#ifdef __cplusplus
 +}
 +#endif

  int
  main ()
  {
 +return f != $ac_func;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  eval "$as_ac_var=yes"
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +eval "$as_ac_var=no"
 +fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: 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 <<_ACEOF
 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
 +
 +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:$LINENO: 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
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
 +
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +
 +#undef $ac_func
 +
 +/* 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 ();
  /* 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;
 +char (*f) () = $ac_func;
 +#endif
 +#ifdef __cplusplus
 +}
  #endif

 +int
 +main ()
 +{
 +return f != $ac_func;
    ;
    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
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:4985: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:4988: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:4991: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  eval "$as_ac_var=no"
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:5001: result: `eval echo '${'$as_ac_var'}'`" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  fi
  done

 -for ac_func in bswap16, bswap32, bswap64
 +
 +
 +for ac_func in fstatvfs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:5014: checking for $ac_func" >&5
 +echo "$as_me:$LINENO: 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"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $ac_func innocuous_$ac_func
 +
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.  */
 -#include <assert.h>
 +    which can conflict with char $ac_func (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
 +
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +
 +#undef $ac_func
 +
  /* 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;
 +char (*f) () = $ac_func;
 +#endif
 +#ifdef __cplusplus
 +}
  #endif

 +int
 +main ()
 +{
 +return f != $ac_func;
    ;
    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
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5054: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5060: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $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
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  eval "$as_ac_var=no"
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:5070: result: `eval echo '${'$as_ac_var'}'`" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -EOF
 +_ACEOF

  fi
  done

 -echo "$as_me:5080: checking whether setgroupent is declared" >&5
 +
 +echo "$as_me:$LINENO: 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 5086 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  #include <sys/types.h>
  #include <grp.h>
  #include <pwd.h>

 +
  int
  main ()
  {
 @@ -5102,52 +7881,69 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5105: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5108: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5111: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5114: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_have_decl_setgroupent=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_have_decl_setgroupent=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:5124: result: $ac_cv_have_decl_setgroupent" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SETGROUPENT 1
 -EOF
 +_ACEOF
 +

  else
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SETGROUPENT 0
 -EOF
 +_ACEOF
 +

  fi
 -echo "$as_me:5138: checking whether setpassent is declared" >&5
 +echo "$as_me:$LINENO: 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 5144 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  #include <sys/types.h>
  #include <grp.h>
  #include <pwd.h>

 +
  int
  main ()
  {
 @@ -5160,44 +7956,60 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:5163: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5166: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:5169: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5172: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_have_decl_setpassent=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_have_decl_setpassent=no
  fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -echo "$as_me:5182: result: $ac_cv_have_decl_setpassent" >&5
 +echo "$as_me:$LINENO: 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

 -cat >>confdefs.h <<EOF
 +cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SETPASSENT 1
 -EOF
 +_ACEOF
 +

  else
 -  cat >>confdefs.h <<EOF
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_SETPASSENT 0
 -EOF
 +_ACEOF
 +

  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:5200: checking for regfree in -lregex" >&5
 +
 +echo "$as_me:$LINENO: 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
 @@ -5205,8 +8017,11 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lregex  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5208 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
 @@ -5224,38 +8039,50 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5227: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5230: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5233: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5236: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_regex_regfree=yes
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  ac_cv_lib_regex_regfree=no
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
 -echo "$as_me:5247: result: $ac_cv_lib_regex_regfree" >&5
 +echo "$as_me:$LINENO: 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
 +  cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBREGEX 1
 -EOF
 +_ACEOF

    LIBS="-lregex $LIBS"

  fi

 -echo "$as_me:5258: checking for library containing regfree" >&5
 +echo "$as_me:$LINENO: 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
 @@ -5263,8 +8090,11 @@
    ac_func_search_save_LIBS=$LIBS
  ac_cv_search_regfree=no
  cat >conftest.$ac_ext <<_ACEOF
 -#line 5266 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
 @@ -5282,29 +8112,44 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5285: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5288: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5291: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5294: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_search_regfree="none required"
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
  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 5306 "configure"
 -#include "confdefs.h"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */

  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
 @@ -5322,35 +8167,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:5325: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>conftest.er1
    ac_status=$?
 -  echo "$as_me:5328: \$? = $ac_status" >&5
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:5331: \"$ac_try\"") >&5
 +	 { ac_try='test -z "$ac_c_werror_flag"
 +			 || test ! -s conftest.err'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
 -  echo "$as_me:5334: \$? = $ac_status" >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_search_regfree="-l$ac_lib"
  break
  else
    echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
  fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
    done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
 -echo "$as_me:5347: result: $ac_cv_search_regfree" >&5
 +echo "$as_me:$LINENO: 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"

  fi

 +
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
 @@ -5361,7 +8219,7 @@
  # config.status only pays attention to the cache file if you give it
  # the --recheck option to rerun configure.
  #
 -# `ac_cv_env_foo' variables (set or unset) will be overriden when
 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
  # loading this file, other *unset* `ac_cv_foo' will be assigned the
  # following values.

 @@ -5379,13 +8237,13 @@
        # `set' does not quote correctly, so add quotes (double-quote
        # substitution turns \\\\ into \\, and sed turns \\ into \).
        sed -n \
 -        "s/'/'\\\\''/g;
 -    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
 +	"s/'/'\\\\''/g;
 +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
        ;;
      *)
        # `set' quotes correctly as required by POSIX, so do not add quotes.
        sed -n \
 -        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
 +	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
        ;;
      esac;
  } |
 @@ -5396,7 +8254,7 @@
       t end
       /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
       : end' >>confcache
 -if cmp -s $cache_file confcache; then :; else
 +if diff $cache_file confcache >/dev/null 2>&1; then :; else
    if test -w $cache_file; then
      test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
      cat confcache >$cache_file
 @@ -5415,47 +8273,240 @@
  # trailing colons and then remove the whole line if VPATH becomes empty
  # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
 -  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
 +  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
  s/:*\$(srcdir):*/:/;
  s/:*\${srcdir}:*/:/;
  s/:*@srcdir@:*/:/;
 -s/^\([^=]*=[ 	]*\):*/\1/;
 +s/^\([^=]*=[	 ]*\):*/\1/;
  s/:*$//;
 -s/^[^=]*=[ 	]*$//;
 +s/^[^=]*=[	 ]*$//;
  }'
  fi

  DEFS=-DHAVE_CONFIG_H

 +ac_libobjs=
 +ac_ltlibobjs=
 +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
 +  # 1. Remove the extension, and $U if already installed.
 +  ac_i=`echo "$ac_i" |
 +	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
 +  # 2. Add them.
 +  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
 +  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 +done
 +LIBOBJS=$ac_libobjs
 +
 +LTLIBOBJS=$ac_ltlibobjs
 +
 +
 +
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 -{ echo "$as_me:5433: creating $CONFIG_STATUS" >&5
 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
  echo "$as_me: creating $CONFIG_STATUS" >&6;}
  cat >$CONFIG_STATUS <<_ACEOF
  #! $SHELL
 -# Generated automatically by configure.
 +# Generated by $as_me.
  # Run this file to recreate the current configuration.
  # Compiler output produced by configure, useful for debugging
  # configure, is in config.log if it exists.

  debug=false
 +ac_cs_recheck=false
 +ac_cs_silent=false
  SHELL=\${CONFIG_SHELL-$SHELL}
 -ac_cs_invocation="\$0 \$@"
 -
  _ACEOF

  cat >>$CONFIG_STATUS <<\_ACEOF
 +## --------------------- ##
 +## M4sh Initialization.  ##
 +## --------------------- ##
 +
  # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
 +  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
  elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
 +DUALCASE=1; export DUALCASE # for MKS sh
 +
 +# Support unset when possible.
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  as_unset=unset
 +else
 +  as_unset=false
 +fi
 +
 +
 +# Work around bugs in pre-3.0 UWIN ksh.
 +$as_unset ENV MAIL MAILPATH
 +PS1='$ '
 +PS2='> '
 +PS4='+ '
 +
 +# NLS nuisances.
 +for as_var in \
 +  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 +  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 +  LC_TELEPHONE LC_TIME
 +do
 +  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 +    eval $as_var=C; export $as_var
 +  else
 +    $as_unset $as_var
 +  fi
 +done
 +
 +# Required to use basename.
 +if expr a : '\(a\)' >/dev/null 2>&1; then
 +  as_expr=expr
 +else
 +  as_expr=false
 +fi
 +
 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
 +fi
 +

  # Name of the executable.
 -as_me=`echo "$0" |sed 's,.*[\\/],,'`
 +as_me=`$as_basename "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 +	 X"$0" : 'X\(//\)$' \| \
 +	 X"$0" : 'X\(/\)$' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
 +echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
 +  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 +  	  /^X\/\(\/\).*/{ s//\1/; q; }
 +  	  s/.*/./; q'`
 +
 +
 +# PATH needs CR, and LINENO needs CR and PATH.
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 +as_cr_digits='0123456789'
 +as_cr_alnum=$as_cr_Letters$as_cr_digits
 +
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  echo "#! /bin/sh" >conf$$.sh
 +  echo  "exit 0"   >>conf$$.sh
 +  chmod +x conf$$.sh
 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 +    PATH_SEPARATOR=';'
 +  else
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
 +fi
 +
 +
 +  as_lineno_1=$LINENO
 +  as_lineno_2=$LINENO
 +  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 +  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 +  # Find who we are.  Look in the path if we contain no path at all
 +  # relative or not.
 +  case $0 in
 +    *[\\/]* ) as_myself=$0 ;;
 +    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +done
 +
 +       ;;
 +  esac
 +  # We did not find ourselves, most probably we were run as `sh COMMAND'
 +  # in which case we are not to be found in the path.
 +  if test "x$as_myself" = x; then
 +    as_myself=$0
 +  fi
 +  if test ! -f "$as_myself"; then
 +    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
 +   { (exit 1); exit 1; }; }
 +  fi
 +  case $CONFIG_SHELL in
 +  '')
 +    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for as_base in sh bash ksh sh5; do
 +	 case $as_dir in
 +	 /*)
 +	   if ("$as_dir/$as_base" -c '
 +  as_lineno_1=$LINENO
 +  as_lineno_2=$LINENO
 +  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 +  test "x$as_lineno_1" != "x$as_lineno_2" &&
 +  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 +	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 +	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
 +	     CONFIG_SHELL=$as_dir/$as_base
 +	     export CONFIG_SHELL
 +	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
 +	   fi;;
 +	 esac
 +       done
 +done
 +;;
 +  esac
 +
 +  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 +  # uniformly replaced by the line number.  The first 'sed' inserts a
 +  # line-number line before each line; the second 'sed' does the real
 +  # work.  The second script uses 'N' to pair each line-number line
 +  # with the numbered line, and appends trailing '-' during
 +  # substitution so that $LINENO is not a special case at line end.
 +  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
 +  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
 +  sed '=' <$as_myself |
 +    sed '
 +      N
 +      s,$,-,
 +      : loop
 +      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
 +      t loop
 +      s,-$,,
 +      s,^['$as_cr_digits']*\n,,
 +    ' >$as_me.lineno &&
 +  chmod +x $as_me.lineno ||
 +    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
 +   { (exit 1); exit 1; }; }
 +
 +  # Don't try to exec as it changes $[0], causing all sort of problems
 +  # (the dirname of $[0] is not the place where we might find the
 +  # original and so on.  Autoconf is especially sensible to this).
 +  . ./$as_me.lineno
 +  # Exit status is that of the last command.
 +  exit
 +}
 +
 +
 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
 +  *c*,-n*) ECHO_N= ECHO_C='
 +' ECHO_T='	' ;;
 +  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 +  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 +esac

  if expr a : '\(a\)' >/dev/null 2>&1; then
    as_expr=expr
 @@ -5481,24 +8532,21 @@
  fi
  rm -f conf$$ conf$$.exe conf$$.file

 -as_executable_p="test -f"
 -
 -# Support unset when possible.
 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
 -  as_unset=unset
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p=:
  else
 -  as_unset=false
 +  test -d ./-p && rmdir ./-p
 +  as_mkdir_p=false
  fi

 -# NLS nuisances.
 -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
 -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
 -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
 -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
 -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
 -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
 -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
 -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
 +as_executable_p="test -f"
 +
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 +
 +# Sed expression to map a string onto a valid variable name.
 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 +

  # IFS
  # We need space, tab and new line, in precisely that order.
 @@ -5507,10 +8555,34 @@
  IFS=" 	$as_nl"

  # CDPATH.
 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 +$as_unset CDPATH

  exec 6>&1

 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
 +# report actual input values of CONFIG_FILES etc. instead of their
 +# values after options handling.  Logging --version etc. is OK.
 +exec 5>>config.log
 +{
 +  echo
 +  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 +## Running $as_me. ##
 +_ASBOX
 +} >&5
 +cat >&5 <<_CSEOF
 +
 +This file was extended by libnbcompat $as_me noversion, which was
 +generated by GNU Autoconf 2.59.  Invocation command line was
 +
 +  CONFIG_FILES    = $CONFIG_FILES
 +  CONFIG_HEADERS  = $CONFIG_HEADERS
 +  CONFIG_LINKS    = $CONFIG_LINKS
 +  CONFIG_COMMANDS = $CONFIG_COMMANDS
 +  $ $0 $@
 +
 +_CSEOF
 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 +echo >&5
  _ACEOF

  # Files that config.status was made for.
 @@ -5530,7 +8602,7 @@
    echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
  fi

 -cat >>$CONFIG_STATUS <<\EOF
 +cat >>$CONFIG_STATUS <<\_ACEOF

  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
 @@ -5540,12 +8612,13 @@

    -h, --help       print this help, then exit
    -V, --version    print version number, then exit
 +  -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
    --file=FILE[:TEMPLATE]
 -                   instantiate the configuration file FILE
 +		   instantiate the configuration file FILE
    --header=FILE[:TEMPLATE]
 -                   instantiate the configuration header FILE
 +		   instantiate the configuration header FILE

  Configuration files:
  $config_files
 @@ -5554,22 +8627,21 @@
  $config_headers

  Report bugs to <bug-autoconf@gnu.org>."
 -EOF
 +_ACEOF

 -cat >>$CONFIG_STATUS <<EOF
 +cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  libnbcompat config.status noversion
 -configured by $0, generated by GNU Autoconf 2.52,
 +configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
 +Copyright (C) 2003 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  srcdir=$srcdir
 -EOF
 +_ACEOF

 -cat >>$CONFIG_STATUS <<\EOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
  # If no file are specified by the user, then we need to provide default
  # value.  By we need to know if files were specified by the user.
  ac_need_defaults=:
 @@ -5579,30 +8651,30 @@
    --*=*)
      ac_option=`expr "x$1" : 'x\([^=]*\)='`
      ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
 -    shift
 -    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
 -    shift
 +    ac_shift=:
 +    ;;
 +  -*)
 +    ac_option=$1
 +    ac_optarg=$2
 +    ac_shift=shift
      ;;
 -  -*);;
    *) # This is not an option, so the user has probably given explicit
       # arguments.
 +     ac_option=$1
       ac_need_defaults=false;;
    esac

 -  case $1 in
 +  case $ac_option in
    # Handling of the options.
 -EOF
 -cat >>$CONFIG_STATUS <<EOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 -    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
 -    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 -EOF
 -cat >>$CONFIG_STATUS <<\EOF
 +    ac_cs_recheck=: ;;
    --version | --vers* | -V )
      echo "$ac_cs_version"; exit 0 ;;
    --he | --h)
      # Conflict between --help and --header
 -    { { echo "$as_me:5605: error: ambiguous option: $1
 +    { { echo "$as_me:$LINENO: 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;}
 @@ -5612,16 +8684,19 @@
    --debug | --d* | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
 -    shift
 -    CONFIG_FILES="$CONFIG_FILES $1"
 +    $ac_shift
 +    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
      ac_need_defaults=false;;
    --header | --heade | --head | --hea )
 -    shift
 -    CONFIG_HEADERS="$CONFIG_HEADERS $1"
 +    $ac_shift
 +    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
 +  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 +  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 +    ac_cs_silent=: ;;

    # This is an error.
 -  -*) { { echo "$as_me:5624: error: unrecognized option: $1
 +  -*) { { echo "$as_me:$LINENO: 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;}
 @@ -5633,32 +8708,34 @@
    shift
  done

 -exec 5>>config.log
 -cat >&5 << _ACEOF
 +ac_configure_extra_args=

 -## ----------------------- ##
 -## Running config.status.  ##
 -## ----------------------- ##
 +if $ac_cs_silent; then
 +  exec 6>/dev/null
 +  ac_configure_extra_args="$ac_configure_extra_args --silent"
 +fi

 -This file was extended by $as_me (libnbcompat noversion) 2.52, executed with
 -  CONFIG_FILES    = $CONFIG_FILES
 -  CONFIG_HEADERS  = $CONFIG_HEADERS
 -  CONFIG_LINKS    = $CONFIG_LINKS
 -  CONFIG_COMMANDS = $CONFIG_COMMANDS
 -  > $ac_cs_invocation
 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF
 +if \$ac_cs_recheck; then
 +  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 +  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 +fi

  _ACEOF
 -EOF

 -cat >>$CONFIG_STATUS <<\EOF
 +
 +
 +
 +
 +cat >>$CONFIG_STATUS <<\_ACEOF
  for ac_config_target in $ac_config_targets
  do
    case "$ac_config_target" in
    # Handling of arguments.
    "defs.mk" ) CONFIG_FILES="$CONFIG_FILES defs.mk" ;;
    "nbtool_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS nbtool_config.h" ;;
 -  *) { { echo "$as_me:5661: error: invalid argument: $ac_config_target" >&5
 +  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
 @@ -5673,6 +8750,9 @@
    test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
  fi

 +# Have a temporary directory for convenience.  Make it in the build tree
 +# simply because there is no reason to put it here, and in addition,
 +# creating and moving files from /tmp can sometimes cause problems.
  # Create a temporary directory, and hook for its removal unless debugging.
  $debug ||
  {
 @@ -5681,23 +8761,23 @@
  }

  # Create a (secure) tmp directory for tmp files.
 -: ${TMPDIR=/tmp}
 +
  {
 -  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
 +  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
  {
 -  tmp=$TMPDIR/cs$$-$RANDOM
 +  tmp=./confstat$$-$RANDOM
    (umask 077 && mkdir $tmp)
  } ||
  {
 -   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
 +   echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }

 -EOF
 +_ACEOF

 -cat >>$CONFIG_STATUS <<EOF
 +cat >>$CONFIG_STATUS <<_ACEOF

  #
  # CONFIG_FILES section.
 @@ -5710,6 +8790,12 @@
    sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
     s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
  s,@SHELL@,$SHELL,;t t
 +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
 +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
  s,@exec_prefix@,$exec_prefix,;t t
  s,@prefix@,$prefix,;t t
  s,@program_transform_name@,$program_transform_name,;t t
 @@ -5725,19 +8811,13 @@
  s,@oldincludedir@,$oldincludedir,;t t
  s,@infodir@,$infodir,;t t
  s,@mandir@,$mandir,;t t
 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
  s,@build_alias@,$build_alias,;t t
  s,@host_alias@,$host_alias,;t t
  s,@target_alias@,$target_alias,;t t
 +s,@DEFS@,$DEFS,;t t
  s,@ECHO_C@,$ECHO_C,;t t
  s,@ECHO_N@,$ECHO_N,;t t
  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,@CC@,$CC,;t t
  s,@CFLAGS@,$CFLAGS,;t t
 @@ -5747,13 +8827,16 @@
  s,@EXEEXT@,$EXEEXT,;t t
  s,@OBJEXT@,$OBJEXT,;t t
  s,@CPP@,$CPP,;t t
 +s,@EGREP@,$EGREP,;t t
  s,@BSHELL@,$BSHELL,;t t
  s,@ALLOCA@,$ALLOCA,;t t
 +s,@LIBOBJS@,$LIBOBJS,;t t
 +s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  CEOF

 -EOF
 +_ACEOF

 -  cat >>$CONFIG_STATUS <<\EOF
 +  cat >>$CONFIG_STATUS <<\_ACEOF
    # Split the substitutions into bite-sized pieces for seds with
    # small command number limits, like on Digital OSF/1 and HP-UX.
    ac_max_sed_lines=48
 @@ -5778,9 +8861,9 @@
        (echo ':t
    /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
        if test -z "$ac_sed_cmds"; then
 -  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
 +	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
        else
 -  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
 +	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
        fi
        ac_sed_frag=`expr $ac_sed_frag + 1`
        ac_beg=$ac_end
 @@ -5792,81 +8875,140 @@
    fi
  fi # test -n "$CONFIG_FILES"

 -EOF
 -cat >>$CONFIG_STATUS <<\EOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
  for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
 -        cat >$tmp/stdin
 -        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 +	cat >$tmp/stdin
 +	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 +	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 +	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
    * )   ac_file_in=$ac_file.in ;;
    esac

    # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
 -  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -         X"$ac_file" : 'X\(//\)[^/]' \| \
 -         X"$ac_file" : 'X\(//\)$' \| \
 -         X"$ac_file" : 'X\(/\)' \| \
 -         .     : '\(.\)' 2>/dev/null ||
 +  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
 +	 X"$ac_file" : 'X\(//\)$' \| \
 +	 X"$ac_file" : 'X\(/\)' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
 -  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
 -    { case "$ac_dir" in
 -  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
 -  *)                      as_incr_dir=.;;
 +  { if $as_mkdir_p; then
 +    mkdir -p "$ac_dir"
 +  else
 +    as_dir="$ac_dir"
 +    as_dirs=
 +    while test ! -d "$as_dir"; do
 +      as_dirs="$as_dir $as_dirs"
 +      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$as_dir" : 'X\(//\)[^/]' \| \
 +	 X"$as_dir" : 'X\(//\)$' \| \
 +	 X"$as_dir" : 'X\(/\)' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
 +echo X"$as_dir" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 +  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 +  	  /^X\(\/\/\)$/{ s//\1/; q; }
 +  	  /^X\(\/\).*/{ s//\1/; q; }
 +  	  s/.*/./; q'`
 +    done
 +    test ! -n "$as_dirs" || mkdir $as_dirs
 +  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 +   { (exit 1); exit 1; }; }; }
 +
 +  ac_builddir=.
 +
 +if test "$ac_dir" != .; then
 +  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 +  # A "../" for each directory in $ac_dir_suffix.
 +  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
 +else
 +  ac_dir_suffix= ac_top_builddir=
 +fi
 +
 +case $srcdir in
 +  .)  # No --srcdir option.  We are building in place.
 +    ac_srcdir=.
 +    if test -z "$ac_top_builddir"; then
 +       ac_top_srcdir=.
 +    else
 +       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
 +    fi ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute path.
 +    ac_srcdir=$srcdir$ac_dir_suffix;
 +    ac_top_srcdir=$srcdir ;;
 +  *) # Relative path.
 +    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 +    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 +esac
 +
 +# Do not use `cd foo && pwd` to compute absolute paths, because
 +# the directories may not exist.
 +case `pwd` in
 +.) ac_abs_builddir="$ac_dir";;
 +*)
 +  case "$ac_dir" in
 +  .) ac_abs_builddir=`pwd`;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
 +  *) ac_abs_builddir=`pwd`/"$ac_dir";;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
 +*)
 +  case ${ac_top_builddir}. in
 +  .) ac_abs_top_builddir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
 +  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_srcdir=$ac_srcdir;;
 +*)
 +  case $ac_srcdir in
 +  .) ac_abs_srcdir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
 +  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
 +  esac;;
 +esac
 +case $ac_abs_builddir in
 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
 +*)
 +  case $ac_top_srcdir in
 +  .) ac_abs_top_srcdir=$ac_abs_builddir;;
 +  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 +  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 +  esac;;
  esac
 -as_dummy="$ac_dir"
 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 -  case $as_mkdir_dir in
 -    # Skip DOS drivespec
 -    ?:) as_incr_dir=$as_mkdir_dir ;;
 -    *)
 -      as_incr_dir=$as_incr_dir/$as_mkdir_dir
 -      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
 -    ;;
 -  esac
 -done; }

 -    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
 -    # A "../" for each directory in $ac_dir_suffix.
 -    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
 -  else
 -    ac_dir_suffix= ac_dots=
 -  fi

 -  case $srcdir in
 -  .)  ac_srcdir=.
 -      if test -z "$ac_dots"; then
 -         ac_top_srcdir=.
 -      else
 -         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
 -      fi ;;
 -  [\\/]* | ?:[\\/]* )
 -      ac_srcdir=$srcdir$ac_dir_suffix;
 -      ac_top_srcdir=$srcdir ;;
 -  *) # Relative path.
 -    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_dots$srcdir ;;
 -  esac

    if test x"$ac_file" != x-; then
 -    { echo "$as_me:5861: creating $ac_file" >&5
 +    { echo "$as_me:$LINENO: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
 -  #    /* config.h.  Generated automatically by config.status.  */
 -  configure_input="Generated automatically from `echo $ac_file_in |
 -                                                 sed 's,.*/,,'` by configure."
 +  #    /* config.h.  Generated by config.status.  */
 +  if test x"$ac_file" = x-; then
 +    configure_input=
 +  else
 +    configure_input="$ac_file.  "
 +  fi
 +  configure_input=$configure_input"Generated from `echo $ac_file_in |
 +				     sed 's,.*/,,'` by configure."

    # First look for the input files in the build tree, otherwise in the
    # src tree.
 @@ -5875,37 +9017,43 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
 -         # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:5879: error: cannot find input file: $f" >&5
 +	 # Absolute (can't be DOS-style, as IFS=:)
 +	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
 -         echo $f;;
 +	 echo "$f";;
        *) # Relative
 -         if test -f "$f"; then
 -           # Build tree
 -           echo $f
 -         elif test -f "$srcdir/$f"; then
 -           # Source tree
 -           echo $srcdir/$f
 -         else
 -           # /dev/null tree
 -           { { echo "$as_me:5892: error: cannot find input file: $f" >&5
 +	 if test -f "$f"; then
 +	   # Build tree
 +	   echo "$f"
 +	 elif test -f "$srcdir/$f"; then
 +	   # Source tree
 +	   echo "$srcdir/$f"
 +	 else
 +	   # /dev/null tree
 +	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
 -         fi;;
 +	 fi;;
        esac
      done` || { (exit 1); exit 1; }
 -EOF
 -cat >>$CONFIG_STATUS <<EOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
 -EOF
 -cat >>$CONFIG_STATUS <<\EOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
  s,@configure_input@,$configure_input,;t t
  s,@srcdir@,$ac_srcdir,;t t
 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
  s,@top_srcdir@,$ac_top_srcdir,;t t
 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
 +s,@builddir@,$ac_builddir,;t t
 +s,@abs_builddir@,$ac_abs_builddir,;t t
 +s,@top_builddir@,$ac_top_builddir,;t t
 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
  " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
    rm -f $tmp/stdin
    if test x"$ac_file" != x-; then
 @@ -5916,8 +9064,8 @@
    fi

  done
 -EOF
 -cat >>$CONFIG_STATUS <<\EOF
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF

  #
  # CONFIG_HEADER section.
 @@ -5927,12 +9075,12 @@
  # NAME is the cpp macro being defined and VALUE is the value it is being given.
  #
  # ac_d sets the value in "#define NAME VALUE" lines.
 -ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
 -ac_dB='[ 	].*$,\1#\2'
 +ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
 +ac_dB='[	 ].*$,\1#\2'
  ac_dC=' '
  ac_dD=',;t'
  # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
 -ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
 +ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
  ac_uB='$,\1#\2define\3'
  ac_uC=' '
  ac_uD=',;t'
 @@ -5941,15 +9089,15 @@
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
 -        cat >$tmp/stdin
 -        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 +	cat >$tmp/stdin
 +	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 +	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
    *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
 -        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
 +	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
    * )   ac_file_in=$ac_file.in ;;
    esac

 -  test x"$ac_file" != x- && { echo "$as_me:5952: creating $ac_file" >&5
 +  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}

    # First look for the input files in the build tree, otherwise in the
 @@ -5959,30 +9107,31 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
 -         # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:5963: error: cannot find input file: $f" >&5
 +	 # Absolute (can't be DOS-style, as IFS=:)
 +	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
 -         echo $f;;
 +	 # Do quote $f, to prevent DOS paths from being IFS'd.
 +	 echo "$f";;
        *) # Relative
 -         if test -f "$f"; then
 -           # Build tree
 -           echo $f
 -         elif test -f "$srcdir/$f"; then
 -           # Source tree
 -           echo $srcdir/$f
 -         else
 -           # /dev/null tree
 -           { { echo "$as_me:5976: error: cannot find input file: $f" >&5
 +	 if test -f "$f"; then
 +	   # Build tree
 +	   echo "$f"
 +	 elif test -f "$srcdir/$f"; then
 +	   # Source tree
 +	   echo "$srcdir/$f"
 +	 else
 +	   # /dev/null tree
 +	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
 -         fi;;
 +	 fi;;
        esac
      done` || { (exit 1); exit 1; }
    # Remove the trailing spaces.
 -  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
 +  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in

 -EOF
 +_ACEOF

  # Transform confdefs.h into two sed scripts, `conftest.defines' and
  # `conftest.undefs', that substitutes the proper values into
 @@ -5998,16 +9147,16 @@
  # `end' is used to avoid that the second main sed command (meant for
  # 0-ary CPP macros) applies to n-ary macro definitions.
  # See the Autoconf documentation for `clear'.
 -cat >confdef2sed.sed <<\EOF
 +cat >confdef2sed.sed <<\_ACEOF
  s/[\\&,]/\\&/g
  s,[\\$`],\\&,g
  t clear
  : clear
 -s,^[ 	]*#[ 	]*define[ 	][ 	]*\(\([^ 	(][^ 	(]*\)([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
 +s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
  t end
 -s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 +s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
  : end
 -EOF
 +_ACEOF
  # If some macros were called several times there might be several times
  # the same #defines, which is useless.  Nevertheless, we may not want to
  # sort them, since we want the *last* AC-DEFINE to be honored.
 @@ -6018,14 +9167,14 @@
  # This sed command replaces #undef with comments.  This is necessary, for
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
 -cat >>conftest.undefs <<\EOF
 -s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 -EOF
 +cat >>conftest.undefs <<\_ACEOF
 +s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 +_ACEOF

  # Break up conftest.defines because some shells have a limit on the size
  # of here documents, and old seds have small limits too (100 cmds).
  echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
 -echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
 +echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
  echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
  echo '  :' >>$CONFIG_STATUS
  rm -f conftest.tail
 @@ -6034,7 +9183,7 @@
    # Write a limited-size here document to $tmp/defines.sed.
    echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#define' lines.
 -  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
 +  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
 @@ -6049,7 +9198,7 @@
    mv conftest.tail conftest.defines
  done
  rm -f conftest.defines
 -echo '  fi # egrep' >>$CONFIG_STATUS
 +echo '  fi # grep' >>$CONFIG_STATUS
  echo >>$CONFIG_STATUS

  # Break up conftest.undefs because some shells have a limit on the size
 @@ -6061,7 +9210,7 @@
    # Write a limited-size here document to $tmp/undefs.sed.
    echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#undef'
 -  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
 +  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
 @@ -6077,51 +9226,59 @@
  done
  rm -f conftest.undefs

 -cat >>$CONFIG_STATUS <<\EOF
 +cat >>$CONFIG_STATUS <<\_ACEOF
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
 -  #    /* config.h.  Generated automatically by config.status.  */
 +  #    /* config.h.  Generated by config.status.  */
    if test x"$ac_file" = x-; then
 -    echo "/* Generated automatically by configure.  */" >$tmp/config.h
 +    echo "/* Generated by configure.  */" >$tmp/config.h
    else
 -    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
 +    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
    fi
    cat $tmp/in >>$tmp/config.h
    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:6093: $ac_file is unchanged" >&5
 +    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
 +      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
 -      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -         X"$ac_file" : 'X\(//\)[^/]' \| \
 -         X"$ac_file" : 'X\(//\)$' \| \
 -         X"$ac_file" : 'X\(/\)' \| \
 -         .     : '\(.\)' 2>/dev/null ||
 +      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
 +	 X"$ac_file" : 'X\(//\)$' \| \
 +	 X"$ac_file" : 'X\(/\)' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
 -      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
 -        { case "$ac_dir" in
 -  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
 -  *)                      as_incr_dir=.;;
 -esac
 -as_dummy="$ac_dir"
 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 -  case $as_mkdir_dir in
 -    # Skip DOS drivespec
 -    ?:) as_incr_dir=$as_mkdir_dir ;;
 -    *)
 -      as_incr_dir=$as_incr_dir/$as_mkdir_dir
 -      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
 -    ;;
 -  esac
 -done; }
 +      { if $as_mkdir_p; then
 +    mkdir -p "$ac_dir"
 +  else
 +    as_dir="$ac_dir"
 +    as_dirs=
 +    while test ! -d "$as_dir"; do
 +      as_dirs="$as_dir $as_dirs"
 +      as_dir=`(dirname "$as_dir") 2>/dev/null ||
 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$as_dir" : 'X\(//\)[^/]' \| \
 +	 X"$as_dir" : 'X\(//\)$' \| \
 +	 X"$as_dir" : 'X\(/\)' \| \
 +	 .     : '\(.\)' 2>/dev/null ||
 +echo X"$as_dir" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
 +  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
 +  	  /^X\(\/\/\)$/{ s//\1/; q; }
 +  	  /^X\(\/\).*/{ s//\1/; q; }
 +  	  s/.*/./; q'`
 +    done
 +    test ! -n "$as_dirs" || mkdir $as_dirs
 +  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
 +   { (exit 1); exit 1; }; }; }

 -      fi
        rm -f $ac_file
        mv $tmp/config.h $ac_file
      fi
 @@ -6130,15 +9287,16 @@
      rm -f $tmp/config.h
    fi
  done
 -EOF
 +_ACEOF

 -cat >>$CONFIG_STATUS <<\EOF
 +cat >>$CONFIG_STATUS <<\_ACEOF

  { (exit 0); exit 0; }
 -EOF
 +_ACEOF
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save

 +
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
  # Unfortunately, on DOS this fails, as config.log is still kept open
 @@ -6149,8 +9307,11 @@
  # need to make the FD available again.
  if test "$no_create" != yes; then
    ac_cs_success=:
 +  ac_config_status_args=
 +  test "$silent" = yes &&
 +    ac_config_status_args="$ac_config_status_args --quiet"
    exec 5>/dev/null
 -  $SHELL $CONFIG_STATUS || ac_cs_success=false
 +  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
 Index: tools/compat/configure.ac
 ===================================================================
 RCS file: /cvsroot/src/tools/compat/configure.ac,v
 retrieving revision 1.46
 diff -u -r1.46 configure.ac
 --- tools/compat/configure.ac	24 Jul 2004 16:32:01 -0000	1.46
 +++ tools/compat/configure.ac	11 Oct 2004 18:28:59 -0000
 @@ -128,6 +128,10 @@
  #include <machine/bswap.h>
  ])

 +AC_CHECK_FUNCS([fstatvfs],,, [
 +#include <sys/statvfs.h>
 +])
 +
  AC_CHECK_DECLS([setgroupent, setpassent],,, [
  #include <sys/types.h>
  #include <grp.h>

 --XsQoSWH+UP9D9v3l--

From: Simon Burge <simonb@wasabisystems.com>
To: James Chacon <jmc@netbsd.org>
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: toolchain/27221: tools/makefs doesn't build 
Date: Tue, 12 Oct 2004 09:51:02 +1000

 James Chacon wrote:

 > On Mon, Oct 11, 2004 at 11:10:05AM +1000, simonb@wasabisystems.com wrote:
 > > 
 > > >Number:         27221
 > > >Category:       toolchain
 > > >Synopsis:       tools/makefs doesn't build
 > 
 > Can you try the attached patch for me?

 Works ... almost :-/

 The tools version builds, but the "native" version fails with:

 /home/netbsd/src/usr.sbin/makefs/ffs.c: In function `ffs_create_image':
 /home/netbsd/src/usr.sbin/makefs/ffs.c:430: warning: unused variable `sfs'

 If we do the

 -#if HAVE_STRUCT_STATVFS_F_IOSIZE
 +#if HAVE_STRUCT_STATVFS_F_IOSIZE && HAVE_FSTATVFS

 thing in line 429 (before the decl of struct statvfs fsf), then both the
 tools and "native" versions of makefs build.  I think then we'd have to
 add "#define HAVE_FSTATVFS 1" to makefs.h as well (both versions still
 build if I do this too)?

 Thanks!
 Simon.
 --
 Simon Burge                            <simonb@wasabisystems.com>
 NetBSD Support and Service:         http://www.wasabisystems.com/

From: James Chacon <jmc@netbsd.org>
To: Simon Burge <simonb@wasabisystems.com>
Cc: gnats-bugs@gnats.NetBSD.org
Subject: Re: toolchain/27221: tools/makefs doesn't build
Date: Mon, 11 Oct 2004 22:12:18 -0500

 On Tue, Oct 12, 2004 at 09:51:02AM +1000, Simon Burge wrote:
 > James Chacon wrote:
 > 
 > > On Mon, Oct 11, 2004 at 11:10:05AM +1000, simonb@wasabisystems.com wrote:
 > > > 
 > > > >Number:         27221
 > > > >Category:       toolchain
 > > > >Synopsis:       tools/makefs doesn't build
 > > 
 > > Can you try the attached patch for me?
 > 
 > Works ... almost :-/
 > 
 > The tools version builds, but the "native" version fails with:
 > 
 > /home/netbsd/src/usr.sbin/makefs/ffs.c: In function `ffs_create_image':
 > /home/netbsd/src/usr.sbin/makefs/ffs.c:430: warning: unused variable `sfs'
 > 
 > If we do the
 > 
 > -#if HAVE_STRUCT_STATVFS_F_IOSIZE
 > +#if HAVE_STRUCT_STATVFS_F_IOSIZE && HAVE_FSTATVFS
 > 
 > thing in line 429 (before the decl of struct statvfs fsf), then both the
 > tools and "native" versions of makefs build.  I think then we'd have to
 > add "#define HAVE_FSTATVFS 1" to makefs.h as well (both versions still
 > build if I do this too)?

 Sounds good. I'll add that and commit

 James
State-Changed-From-To: open->closed 
State-Changed-By: jmc 
State-Changed-When: Tue Oct 12 03:28:40 UTC 2004 
State-Changed-Why:  
Fixed by having configure check for fstatvfs and provide a proper HAVE_xx 
def for makefs to check before calling it. 

From: James Chacon <jmc@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:  
Subject: pr/27221 CVS commit: src
Date: Tue, 12 Oct 2004 03:28:32 +0000 (UTC)

 Module Name:	src
 Committed By:	jmc
 Date:		Tue Oct 12 03:28:32 UTC 2004

 Modified Files:
 	src/tools/compat: configure configure.ac nbtool_config.h.in
 	src/usr.sbin/makefs: ffs.c makefs.h

 Log Message:
 Check for fstatvfs and provide/use it only if the host system has it.
 Fixes PR#27221


 To generate a diff of this commit:
 cvs rdiff -r1.47 -r1.48 src/tools/compat/configure
 cvs rdiff -r1.46 -r1.47 src/tools/compat/configure.ac
 cvs rdiff -r1.6 -r1.7 src/tools/compat/nbtool_config.h.in
 cvs rdiff -r1.31 -r1.32 src/usr.sbin/makefs/ffs.c
 cvs rdiff -r1.14 -r1.15 src/usr.sbin/makefs/makefs.h

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.