 @@ -1,16 +1,16 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libnbcompat 20080519.
+# Generated by GNU Autoconf 2.63 for libnbcompat 20080519.
+#
 # Report bugs to <grant@NetBSD.org>.
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 @@ -626,96 +626,96 @@ ac_includes_default="\
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
-ac_subst_vars='SHELL
+ac_subst_vars='LTLIBOBJS
 PATH_SEPARATOR
 PACKAGE_NAME
 PACKAGE_TARNAME
 PACKAGE_VERSION
 PACKAGE_STRING
 PACKAGE_BUGREPORT
 exec_prefix
 prefix
 program_transform_name
 bindir
 sbindir
 libexecdir
 datarootdir
 datadir
 sysconfdir
 sharedstatedir
 localstatedir
 includedir
 oldincludedir
 docdir
 infodir
 htmldir
 dvidir
 pdfdir
 psdir
 libdir
 localedir
 mandir
 DEFS
 ECHO_C
 ECHO_N
 ECHO_T
 LIBS
 build_alias
 host_alias
 target_alias
 build
 build_cpu
 build_vendor
 build_os
 host
 host_cpu
 host_vendor
 host_os
 CANONICAL_HOST
 INCLUDES
 SET_MAKE
 CC
 CFLAGS
 LDFLAGS
 CPPFLAGS
 ac_ct_CC
 EXEEXT
 OBJEXT
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
 LN_S
 RANLIB
 AWK
 AR
 AUTOCONF
 AUTOHEADER
 CPP
 GREP
 EGREP
 LIBOBJS
 WITH_DB
-LTLIBOBJS'
+LIBOBJS
 EGREP
 GREP
 CPP
 AUTOHEADER
 AUTOCONF
 AR
 AWK
 RANLIB
 LN_S
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 OBJEXT
 EXEEXT
 ac_ct_CC
 CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
 SET_MAKE
 INCLUDES
 CANONICAL_HOST
 host_os
 host_vendor
 host_cpu
 host
 build_os
 build_vendor
 build_cpu
 build
 target_alias
 host_alias
 build_alias
 LIBS
 ECHO_T
 ECHO_N
 ECHO_C
 DEFS
 mandir
 localedir
 libdir
 psdir
 pdfdir
 dvidir
 htmldir
 infodir
 docdir
 oldincludedir
 includedir
 localstatedir
 sharedstatedir
 sysconfdir
 datadir
 datarootdir
 libexecdir
 sbindir
 bindir
 program_transform_name
 prefix
 exec_prefix
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_db
 enable_bsd_getopt
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
 LIBS
 @@ -1133,29 +1133,29 @@ Try \`$0 --help' for more information."
   esac
 done
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
    { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
   case $ac_val in
     */ )
 @@ -1188,27 +1188,27 @@ if test "x$host_alias" != x; then
     cross_compiling=yes
   fi
 fi
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 # 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 the parent directory.
   ac_confdir=`$as_dirname -- "$as_myself" ||
 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 @@ -1421,41 +1421,41 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
       $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 libnbcompat configure 20080519
-generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.63
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 , 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
 cat >config.log <<_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 20080519, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
   $ $0 $@
 _ACEOF
 exec 5>>config.log
+{
 cat <<_ASUNAME
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 @@ -1558,28 +1558,28 @@ trap 'exit_status=$?
     cat <<\_ASBOX
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
+(
   for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
   (set) 2>&1 |
     case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       sed -n \
 	"s/'\''/'\''\\\\'\'''\''/g;
 @@ -1762,26 +1762,28 @@ $as_echo "$as_me:   current value: \`$ac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
     *\'*) ac_arg=$ac_var=`$as_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
   { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 $as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 @@ -2050,32 +2052,28 @@ ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-whose name does not start with the host triplet.  If you think this
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 configuration is useful to you, please write to autoconf@gnu.org." >&5
 $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 else
   CC="$ac_cv_prog_CC"
 fi
 if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 @@ -2254,46 +2252,44 @@ else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
   test -n "$ac_ct_CC" && break
 done
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-whose name does not start with the host triplet.  If you think this
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 configuration is useful to you, please write to autoconf@gnu.org." >&5
 $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 fi
 fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 # Provide some information about the compiler.
 $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
 @@ -2403,31 +2399,33 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 ac_exeext=$ac_cv_exeext
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 { $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&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'
   { (case "(($ac_try" in
 @@ -2435,33 +2433,35 @@ if test "$cross_compiling" != yes; then
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_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
-	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_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
 $as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
 { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 { $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
 { $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
 @@ -2484,31 +2484,33 @@ $as_echo "$ac_try_echo") >&5
 # 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 conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 rm -f conftest$ac_cv_exeext
 { $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 { $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
   $as_echo_n "(cached) " >&6
 @@ -2542,31 +2544,33 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -3080,32 +3084,28 @@ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
   { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
   if test "x$ac_ct_RANLIB" = x; then
     RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-whose name does not start with the host triplet.  If you think this
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 configuration is useful to you, please write to autoconf@gnu.org." >&5
 $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
   fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 @@ -3246,27 +3246,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_util_fparseln=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_fparseln" >&5
 $as_echo "$ac_cv_lib_util_fparseln" >&6; }
-if test $ac_cv_lib_util_fparseln = yes; then
+if test "x$ac_cv_lib_util_fparseln" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBUTIL 1
 _ACEOF
   LIBS="-lutil $LIBS"
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 @@ -3477,31 +3477,33 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 @@ -3927,28 +3929,29 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 @@ -4135,28 +4138,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 for ac_header in sys/mount.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 @@ -4201,28 +4205,29 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
+  :
 fi
 done
 for ac_header in glob.h
 @@ -4354,28 +4359,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_GLOB 1
 _ACEOF
 @@ -4517,28 +4523,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_QUEUE 1
 _ACEOF
 @@ -4674,28 +4681,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:$LINENO: checking for regexec" >&5
 $as_echo_n "checking for regexec... " >&6; }
 if test "${ac_cv_func_regexec+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -4769,27 +4777,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_regexec=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_regexec" >&5
 $as_echo "$ac_cv_func_regexec" >&6; }
-if test $ac_cv_func_regexec = yes; then
+if test "x$ac_cv_func_regexec" = x""yes; then
+  :
 else
 	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_REGEX 1
 _ACEOF
 	case " $LIBOBJS " in
   *" regcomp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS regcomp.$ac_objext"
  ;;
 @@ -4947,28 +4955,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 	{ $as_echo "$as_me:$LINENO: checking for MD5Init in md5.h" >&5
 $as_echo_n "checking for MD5Init in md5.h... " >&6; }
 if test "${pkg_cv_have_md5init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 @@ -5175,28 +5184,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:$LINENO: checking for MD5File" >&5
 $as_echo_n "checking for MD5File... " >&6; }
 if test "${ac_cv_func_MD5File+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -5270,27 +5280,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_MD5File=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_MD5File" >&5
 $as_echo "$ac_cv_func_MD5File" >&6; }
-if test $ac_cv_func_MD5File = yes; then
+if test "x$ac_cv_func_MD5File" = x""yes; then
+  :
 else
        	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_MD5 1
 _ACEOF
 	case " $LIBOBJS " in
   *" md5c.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS md5c.$ac_objext"
  ;;
 @@ -5380,27 +5390,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_RMD160File=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_RMD160File" >&5
 $as_echo "$ac_cv_func_RMD160File" >&6; }
-if test $ac_cv_func_RMD160File = yes; then
+if test "x$ac_cv_func_RMD160File" = x""yes; then
+  :
 else
        	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_RMD160 1
 _ACEOF
 	case " $LIBOBJS " in
   *" rmd160.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS rmd160.$ac_objext"
  ;;
 @@ -5490,27 +5500,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_SHA1File=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_SHA1File" >&5
 $as_echo "$ac_cv_func_SHA1File" >&6; }
-if test $ac_cv_func_SHA1File = yes; then
+if test "x$ac_cv_func_SHA1File" = x""yes; then
+  :
 else
        	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_SHA1 1
 _ACEOF
 	case " $LIBOBJS " in
   *" sha1.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS sha1.$ac_objext"
  ;;
 @@ -5601,27 +5611,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_SHA512_File=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_SHA512_File" >&5
 $as_echo "$ac_cv_func_SHA512_File" >&6; }
-if test $ac_cv_func_SHA512_File = yes; then
+if test "x$ac_cv_func_SHA512_File" = x""yes; then
+  :
 else
        	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_SHA2 1
 _ACEOF
 	case " $LIBOBJS " in
   *" sha2.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS sha2.$ac_objext"
  ;;
 @@ -5635,26 +5645,127 @@ esac
 fi
 # Check whether --enable-db was given.
 if test "${enable_db+set}" = set; then
   enableval=$enable_db;
 fi
 WITH_DB=$enable_db
 for ac_func in issetugid
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 $as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&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 GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 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
 #endif
 int
 main ()
+{
 return $ac_func ();
+  ;
   return 0;
+}
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
   eval "$as_ac_var=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 as_val=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 # Check whether --enable-bsd-getopt was given.
 if test "${enable_bsd_getopt+set}" = set; then
   enableval=$enable_bsd_getopt;
 fi
 { $as_echo "$as_me:$LINENO: checking whether optind is declared" >&5
 $as_echo_n "checking whether optind is declared... " >&6; }
 if test "${ac_cv_have_decl_optind+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 @@ -5699,27 +5810,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_optind=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_optind=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optind" >&5
 $as_echo "$ac_cv_have_decl_optind" >&6; }
-if test $ac_cv_have_decl_optind = yes; then
+if test "x$ac_cv_have_decl_optind" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTIND 1
 _ACEOF
+:
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTIND 0
 _ACEOF
+:
 fi
 @@ -5771,27 +5882,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_optreset=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_optreset=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
 $as_echo "$ac_cv_have_decl_optreset" >&6; }
-if test $ac_cv_have_decl_optreset = yes; then
+if test "x$ac_cv_have_decl_optreset" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTRESET 1
 _ACEOF
+:
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_OPTRESET 0
 _ACEOF
+:
 fi
 @@ -5930,28 +6041,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 	{ $as_echo "$as_me:$LINENO: checking for struct option" >&5
 $as_echo_n "checking for struct option... " >&6; }
 if test "${pkg_cv_have_struct_option+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 @@ -6164,28 +6276,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 	{ $as_echo "$as_me:$LINENO: checking for VIS_WHITE in vis.h" >&5
 $as_echo_n "checking for VIS_WHITE in vis.h... " >&6; }
 if test "${pkg_cv_have_vis_white+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 @@ -6324,28 +6437,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 @@ -6429,28 +6543,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  pkg_use_nbcompat_vis=no
 else
   pkg_use_nbcompat_vis=yes; break
 fi
 done
 	else
+		:
 @@ -6629,27 +6744,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 $as_echo "$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+if test "x$ac_cv_type_size_t" = x""yes; then
+  :
 else
 cat >>confdefs.h <<_ACEOF
 #define size_t unsigned int
 _ACEOF
 fi
   { $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
 $as_echo_n "checking for uintptr_t... " >&6; }
 if test "${ac_cv_type_uintptr_t+set}" = set; then
 @@ -6734,27 +6849,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
 $as_echo "$ac_cv_type_uintptr_t" >&6; }
-if test $ac_cv_type_uintptr_t = yes; then
+if test "x$ac_cv_type_uintptr_t" = x""yes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UINTPTR_T 1
 _ACEOF
 else
   for ac_type in 'unsigned int' 'unsigned long int' \
 	'unsigned long long int'; do
        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 @@ -7685,27 +7800,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
 $as_echo "$ac_cv_type_long_long" >&6; }
-if test $ac_cv_type_long_long = yes; then
+if test "x$ac_cv_type_long_long" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LONG_LONG 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for long double" >&5
 $as_echo_n "checking for long double... " >&6; }
 if test "${ac_cv_type_long_double+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_type_long_double=no
 @@ -7813,27 +7928,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
 $as_echo "$ac_cv_type_long_double" >&6; }
-if test $ac_cv_type_long_double = yes; then
+if test "x$ac_cv_type_long_double" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LONG_DOUBLE 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for fsid_t" >&5
 $as_echo_n "checking for fsid_t... " >&6; }
 if test "${ac_cv_type_fsid_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -7940,74 +8055,80 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_fsid_t" >&5
 $as_echo "$ac_cv_type_fsid_t" >&6; }
-if test $ac_cv_type_fsid_t = yes; then
+if test "x$ac_cv_type_fsid_t" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_FSID_T 1
 _ACEOF
 fi
  { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
-    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
+    # See if we're dealing with a universal compiler.
-       cat >conftest.$ac_ext <<_ACEOF
+    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
+#ifndef __APPLE_CC__
-	       neither is defined;
+	       not a universal capable compiler
 	     #endif
 	     typedef int dummy;
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=universal
 	# Check for potential -arch flags.  It is not universal unless
 	# there are some -arch flags.  Note that *ppc* also matches
 	# ppc64.  This check is also rather less than ideal.
 	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
 	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
 	esac
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 @@ -8335,27 +8456,32 @@ fi
     fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 $as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
      cat >>confdefs.h <<\_ACEOF
 #define WORDS_BIGENDIAN 1
 _ACEOF
 ;; #(
    no)
       ;; #(
    universal)
       ;; #(
 cat >>confdefs.h <<\_ACEOF
 #define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
      ;; #(
    *)
      { { $as_echo "$as_me:$LINENO: error: unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" >&5
 $as_echo "$as_me: error: unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
  esac
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:$LINENO: checking size of off_t" >&5
 @@ -8595,31 +8721,33 @@ $as_echo "$ac_try_echo") >&5
   ac_hi=$ac_mid
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_off_t=$ac_lo;;
 '') if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_off_t=0
    fi ;;
 esac
 else
   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
 static long int longval () { return (long int) (sizeof (off_t)); }
 @@ -8675,31 +8803,33 @@ eval ac_try_echo="\"\$as_me:$LINENO: $ac
 $as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 if test "$ac_cv_type_off_t" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&5
 $as_echo "$as_me: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_off_t=0
    fi
 fi
 rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
 $as_echo "$ac_cv_sizeof_off_t" >&6; }
 @@ -8841,28 +8971,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
 if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -8997,27 +9128,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_strerror_r=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_strerror_r=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
 $as_echo "$ac_cv_have_decl_strerror_r" >&6; }
-if test $ac_cv_have_decl_strerror_r = yes; then
+if test "x$ac_cv_have_decl_strerror_r" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRERROR_R 1
 _ACEOF
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRERROR_R 0
 _ACEOF
 fi
 @@ -9104,28 +9235,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
 $as_echo_n "checking whether strerror_r returns char *... " >&6; }
 if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -9337,27 +9469,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 $as_echo "$ac_cv_type_pid_t" >&6; }
-if test $ac_cv_type_pid_t = yes; then
+if test "x$ac_cv_type_pid_t" = x""yes; then
+  :
 else
 cat >>confdefs.h <<_ACEOF
 #define pid_t int
 _ACEOF
 fi
 for ac_header in vfork.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 @@ -9487,28 +9619,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 for ac_func in fork vfork
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 @@ -9589,28 +9722,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 if test "x$ac_cv_func_fork" = xyes; then
   { $as_echo "$as_me:$LINENO: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
 if test "${ac_cv_func_fork_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -9946,28 +10080,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 { $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
 $as_echo_n "checking for _doprnt... " >&6; }
 if test "${ac_cv_func__doprnt+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 @@ -10037,27 +10172,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func__doprnt=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
 $as_echo "$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
+if test "x$ac_cv_func__doprnt" = x""yes; then
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_DOPRNT 1
 _ACEOF
 fi
 fi
 done
 { $as_echo "$as_me:$LINENO: checking whether snprintf is declared" >&5
 @@ -10104,27 +10239,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_snprintf=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_snprintf=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5
 $as_echo "$ac_cv_have_decl_snprintf" >&6; }
-if test $ac_cv_have_decl_snprintf = yes; then
+if test "x$ac_cv_have_decl_snprintf" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SNPRINTF 1
 _ACEOF
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_SNPRINTF 0
 _ACEOF
 fi
 @@ -10172,27 +10307,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_vasprintf=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_vasprintf=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_vasprintf" >&5
 $as_echo "$ac_cv_have_decl_vasprintf" >&6; }
-if test $ac_cv_have_decl_vasprintf = yes; then
+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_VASPRINTF 1
 _ACEOF
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_VASPRINTF 0
 _ACEOF
 fi
 @@ -10314,28 +10449,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 else
   case " $LIBOBJS " in
   *" $ac_func.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
  ;;
 esac
 fi
 done
 @@ -10398,27 +10534,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_socket_socket=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
 $as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test $ac_cv_lib_socket_socket = yes; then
+if test "x$ac_cv_lib_socket_socket" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKET 1
 _ACEOF
   LIBS="-lsocket $LIBS"
 fi
 { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   $as_echo_n "(cached) " >&6
 @@ -10473,27 +10609,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_lib_nsl_gethostbyname=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNSL 1
 _ACEOF
   LIBS="-lnsl $LIBS"
 fi
 need_getaddrinfo=no
 { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
 $as_echo_n "checking for socklen_t... " >&6; }
 if test "${ac_cv_type_socklen_t+set}" = set; then
 @@ -10590,27 +10726,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
 $as_echo "$ac_cv_type_socklen_t" >&6; }
-if test $ac_cv_type_socklen_t = yes; then
+if test "x$ac_cv_type_socklen_t" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SOCKLEN_T 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for struct addrinfo" >&5
 $as_echo_n "checking for struct addrinfo... " >&6; }
 if test "${ac_cv_type_struct_addrinfo+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -10695,27 +10831,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
 $as_echo "$ac_cv_type_struct_addrinfo" >&6; }
-if test $ac_cv_type_struct_addrinfo = yes; then
+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_ADDRINFO 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for struct in6_addr" >&5
 $as_echo_n "checking for struct in6_addr... " >&6; }
 if test "${ac_cv_type_struct_in6_addr+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -10808,27 +10944,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_in6_addr" >&5
 $as_echo "$ac_cv_type_struct_in6_addr" >&6; }
-if test $ac_cv_type_struct_in6_addr = yes; then
+if test "x$ac_cv_type_struct_in6_addr" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IN6_ADDR 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
 $as_echo_n "checking for struct sockaddr_in6... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -10921,27 +11057,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5
 $as_echo "$ac_cv_type_struct_sockaddr_in6" >&6; }
-if test $ac_cv_type_struct_sockaddr_in6 = yes; then
+if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_IN6 1
 _ACEOF
 fi
 { $as_echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
 $as_echo_n "checking for struct sockaddr_storage... " >&6; }
 if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -11034,27 +11170,27 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
 $as_echo "$ac_cv_type_struct_sockaddr_storage" >&6; }
-if test $ac_cv_type_struct_sockaddr_storage = yes; then
+if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
 _ACEOF
 fi
 for ac_func in getnameinfo gai_strerror getaddrinfo
 do
 @@ -11136,28 +11272,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
   need_getaddrinfo=yes
 fi
 done
 if test $need_getaddrinfo = yes; then
 	case " $LIBOBJS " in
   *" getaddrinfo.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext"
 @@ -11250,28 +11387,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
   need_findenv=yes
 fi
 done
 if test $need_findenv = yes; then
 	case " $LIBOBJS " in
   *" findenv.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS findenv.$ac_objext"
 @@ -11363,28 +11501,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
    need_gettemp=yes
 fi
 done
 if test $need_gettemp = yes; then
 	case " $LIBOBJS " in
   *" gettemp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS gettemp.$ac_objext"
 @@ -11478,28 +11617,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 need_setmode=no
 for ac_func in getmode setmode
 do
 @@ -11581,28 +11721,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
   need_setmode=yes
 fi
 done
 if test $need_setmode = yes; then
 	case " $LIBOBJS " in
   *" setmode.$ac_objext "* ) ;;
 @@ -11655,27 +11796,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_endgrent=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_endgrent=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_endgrent" >&5
 $as_echo "$ac_cv_have_decl_endgrent" >&6; }
-if test $ac_cv_have_decl_endgrent = yes; then
+if test "x$ac_cv_have_decl_endgrent" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ENDGRENT 1
 _ACEOF
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ENDGRENT 0
 _ACEOF
 fi
 @@ -11722,27 +11863,27 @@ $as_echo "$ac_try_echo") >&5
        } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_endpwent=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_have_decl_endpwent=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_endpwent" >&5
 $as_echo "$ac_cv_have_decl_endpwent" >&6; }
-if test $ac_cv_have_decl_endpwent = yes; then
+if test "x$ac_cv_have_decl_endpwent" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ENDPWENT 1
 _ACEOF
 else
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ENDPWENT 0
 _ACEOF
 fi
 @@ -11838,28 +11979,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+ :
 else
   need_pwcache=yes
 fi
 done
 if test $need_pwcache = yes; then
 	case " $LIBOBJS " in
   *" pwcache.$ac_objext "* ) ;;
 @@ -11944,27 +12086,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_fts_open=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fts_open" >&5
 $as_echo "$ac_cv_func_fts_open" >&6; }
-if test $ac_cv_func_fts_open = yes; then
+if test "x$ac_cv_func_fts_open" = x""yes; then
+  :
 else
 	cat >>confdefs.h <<\_ACEOF
 #define HAVE_NBCOMPAT_FTS 1
 _ACEOF
 	case " $LIBOBJS " in
   *" fts.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS fts.$ac_objext"
  ;;
 @@ -12049,27 +12191,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_timegm=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_timegm" >&5
 $as_echo "$ac_cv_func_timegm" >&6; }
-if test $ac_cv_func_timegm = yes; then
+if test "x$ac_cv_func_timegm" = x""yes; then
+  :
 else
   case " $LIBOBJS " in
   *" timegm.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS timegm.$ac_objext"
  ;;
 esac
 fi
 # Handle Darwin 7 having a poll() compatibility function.  Be
 # conservative -- if we don't find one of <poll.h> or <sys/poll.h>, then
 @@ -12207,28 +12349,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 for ac_header in poll.h sys/poll.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 @@ -12358,28 +12501,29 @@ esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
+as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  pkg_cv_have_poll_h=yes
 fi
 done
 pkg_use_nbcompat_poll=yes
 if test $pkg_cv_have_poll_h = yes; then
 	pkg_use_nbcompat_poll=no
 fi
 @@ -12460,27 +12604,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_poll=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_poll" >&5
 $as_echo "$ac_cv_func_poll" >&6; }
-if test $ac_cv_func_poll = yes; then
+if test "x$ac_cv_func_poll" = x""yes; then
 	{ $as_echo "$as_me:$LINENO: checking if poll() is implemented natively" >&5
 $as_echo_n "checking if poll() is implemented natively... " >&6; }
 if test "${pkg_cv_native_poll+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 @@ -12645,28 +12789,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 { $as_echo "$as_me:$LINENO: checking for getpgrp" >&5
 $as_echo_n "checking for getpgrp... " >&6; }
 if test "${ac_cv_func_getpgrp+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 @@ -12740,27 +12885,27 @@ $as_echo "$ac_try_echo") >&5
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_func_getpgrp=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp" >&5
 $as_echo "$ac_cv_func_getpgrp" >&6; }
-if test $ac_cv_func_getpgrp = yes; then
+if test "x$ac_cv_func_getpgrp" = x""yes; then
   { $as_echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
 $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
 if test "${ac_cv_func_getpgrp_void+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   # Use it with a single arg.
 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
 @@ -12901,27 +13046,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_member_struct_statfs_f_flags=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_flags" >&5
 $as_echo "$ac_cv_member_struct_statfs_f_flags" >&6; }
-if test $ac_cv_member_struct_statfs_f_flags = yes; then
+if test "x$ac_cv_member_struct_statfs_f_flags" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STATFS_F_FLAGS 1
 _ACEOF
+:
 else
+  :
 fi
 { $as_echo "$as_me:$LINENO: checking for struct statfs.f_fsize" >&5
 $as_echo_n "checking for struct statfs.f_fsize... " >&6; }
 if test "${ac_cv_member_struct_statfs_f_fsize+set}" = set; then
 @@ -13009,27 +13154,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_member_struct_statfs_f_fsize=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_fsize" >&5
 $as_echo "$ac_cv_member_struct_statfs_f_fsize" >&6; }
-if test $ac_cv_member_struct_statfs_f_fsize = yes; then
+if test "x$ac_cv_member_struct_statfs_f_fsize" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STATFS_F_FSIZE 1
 _ACEOF
+:
 else
+  :
 fi
 { $as_echo "$as_me:$LINENO: checking for struct statfs.f_iosize" >&5
 $as_echo_n "checking for struct statfs.f_iosize... " >&6; }
 if test "${ac_cv_member_struct_statfs_f_iosize+set}" = set; then
 @@ -13117,27 +13262,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_member_struct_statfs_f_iosize=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_statfs_f_iosize" >&5
 $as_echo "$ac_cv_member_struct_statfs_f_iosize" >&6; }
-if test $ac_cv_member_struct_statfs_f_iosize = yes; then
+if test "x$ac_cv_member_struct_statfs_f_iosize" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STATFS_F_IOSIZE 1
 _ACEOF
+:
 else
+  :
 fi
 { $as_echo "$as_me:$LINENO: checking for struct dirent.d_namlen" >&5
 $as_echo_n "checking for struct dirent.d_namlen... " >&6; }
 if test "${ac_cv_member_struct_dirent_d_namlen+set}" = set; then
 @@ -13253,27 +13398,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_member_struct_dirent_d_namlen=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_dirent_d_namlen" >&5
 $as_echo "$ac_cv_member_struct_dirent_d_namlen" >&6; }
-if test $ac_cv_member_struct_dirent_d_namlen = yes; then
+if test "x$ac_cv_member_struct_dirent_d_namlen" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_DIRENT_D_NAMLEN 1
 _ACEOF
+:
 else
+  :
 fi
 { $as_echo "$as_me:$LINENO: checking for DIR.dd_fd" >&5
 $as_echo_n "checking for DIR.dd_fd... " >&6; }
 if test "${ac_cv_member_DIR_dd_fd+set}" = set; then
   $as_echo_n "(cached) " >&6
 @@ -13388,27 +13533,27 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_member_DIR_dd_fd=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_member_DIR_dd_fd" >&5
 $as_echo "$ac_cv_member_DIR_dd_fd" >&6; }
-if test $ac_cv_member_DIR_dd_fd = yes; then
+if test "x$ac_cv_member_DIR_dd_fd" = x""yes; then
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DIR_DD_FD 1
 _ACEOF
+:
 else
+  :
 fi
 { $as_echo "$as_me:$LINENO: checking for dirfd" >&5
 $as_echo_n "checking for dirfd... " >&6; }
 @@ -13715,28 +13860,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval 'as_val=${'$as_ac_var'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
+as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+		 $as_echo "$as_val"'`
    if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 else
   case " $LIBOBJS " in
   *" $ac_func.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
  ;;
 esac
 fi
 done
 @@ -13850,28 +13996,28 @@ cat >confcache <<\_ACEOF
 _ACEOF
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
+(
   for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes (double-quote
 @@ -13921,26 +14067,27 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 { $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # 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.
 @@ -14243,76 +14390,86 @@ as_executable_p=$as_test_x
 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'"
 exec 6>&1
 # Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by libnbcompat $as_me 20080519, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
 _ACEOF
 case $ac_config_files in *"
 "*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
 case $ac_config_headers in *"
 "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
 esac
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
                    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]
+      --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
+      --header=FILE[:TEMPLATE]
                    instantiate the configuration header FILE
 Configuration files:
 $config_files
 Configuration headers:
 $config_headers
 Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 libnbcompat config.status 20080519
-configured by $0, generated by GNU Autoconf 2.62,
+configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 @@ -14490,27 +14647,28 @@ _ACEOF
   echo "_ACEOF"
 } >conf$$subs.sh ||
   { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 rm -f conf$$subs.sh
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 @@ -14695,62 +14853,62 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+}
 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
   line = \$ 0
   split(line, arg, " ")
   if (arg[1] == "#") {
     defundef = arg[2]
     mac1 = arg[3]
   } else {
     defundef = substr(arg[1], 2)
     mac1 = arg[2]
+  }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
     prefix = substr(line, 1, index(line, defundef) - 1)
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
     # Replace #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.
     if (defundef == "undef") {
-      print "/*", line, "*/"
+      print "/*", prefix defundef, macro, "*/"
       next
+    }
+  }
+}
 { print }
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
   { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
 $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
    { (exit 1); exit 1; }; }
 fi # test -n "$CONFIG_HEADERS"
 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
 shift
 for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
   ac_save_IFS=$IFS
   IFS=:
   set x $ac_tag
   IFS=$ac_save_IFS
   shift
   ac_file=$1
   shift
   case $ac_mode in
 @@ -15053,17 +15211,17 @@ $as_echo "$as_me: error: write failure c
 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_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.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi

 @@ -1,14 +1,14 @@
-dnl $NetBSD: configure.ac,v 1.70 2008/11/08 21:35:58 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.71 2009/02/09 20:35:21 joerg Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT([libnbcompat], [20080519], [grant@NetBSD.org])
 AC_CONFIG_HEADER(nbcompat/config.h)
 AC_ARG_PROGRAM
 AC_CANONICAL_HOST
 CANONICAL_HOST=$host
 AC_SUBST(CANONICAL_HOST)
 AC_SUBST(INCLUDES)
 # Checks for programs.
 @@ -125,26 +125,27 @@ AC_CHECK_FUNC(SHA1File, [:], [
 AC_CHECK_FUNC(SHA512_File, [:], [
        	AC_DEFINE(HAVE_NBCOMPAT_SHA2)
 	AH_TEMPLATE([HAVE_NBCOMPAT_SHA2], [
 		Define to 1 if the `SHA2*' functions are built into the
 		library.
         ])
 	AC_LIBOBJ(sha2)
 	AC_LIBOBJ(sha2hl)
 ])
 AC_ARG_ENABLE([db],
 	[AS_HELP_STRING([--enable-db], [include DB implementation])])
 AC_SUBST(WITH_DB, $enable_db)
 AC_CHECK_FUNCS(issetugid)
 AC_ARG_ENABLE([bsd-getopt],
 	[AS_HELP_STRING([--enable-bsd-getopt],
 			[force use of BSDish getopt implementation])])
 AC_CHECK_DECLS([optind, optreset], [:], [:], [
 	#include <stdio.h>
 	#include <stdlib.h>
 	#include <unistd.h>
 ])
 pkg_use_nbcompat_getopt_long=yes

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bt_open.c,v 1.2 2008/10/28 17:57:36 joerg Exp $	*/
+/*	$NetBSD: bt_open.c,v 1.3 2009/02/09 20:35:21 joerg Exp $	*/
 /*	NetBSD: bt_open.c,v 1.24 2008/09/11 12:58:00 joerg Exp 	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: bt_open.c,v 1.2 2008/10/28 17:57:36 joerg Exp $");
+__RCSID("$NetBSD: bt_open.c,v 1.3 2009/02/09 20:35:21 joerg Exp $");
 /*
  * Implementation of btree access method for 4.4BSD.
+ *
  * The design here was originally based on that of the btree access method
  * used in the Postgres database system at UC Berkeley.  This implementation
  * is wholly independent of the Postgres code.
  */
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
 @@ -384,29 +384,31 @@ nroot(BTREE *t)
 	mpool_put(t->bt_mp, root, MPOOL_DIRTY);
 	return (RET_SUCCESS);
+}
 static int
 tmp(void)
+{
 	sigset_t set, oset;
 	size_t len;
 	int fd;
 	char *envtmp;
 	char path[PATH_MAX];
 #if HAVE_ISSETUGID
 	if (issetugid())
 		envtmp = NULL;
 	else
 #endif
 		envtmp = getenv("TMPDIR");
 	len = snprintf(path,
 	    sizeof(path), "%s/bt.XXXXXX", envtmp ? envtmp : _PATH_TMP);
 	if (len >= sizeof(path))
 		return -1;
 	(void)sigfillset(&set);
 	(void)sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((fd = mkstemp(path)) != -1) {
 		(void)unlink(path);
 		(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hash_page.c,v 1.2 2008/10/28 17:57:36 joerg Exp $	*/
+/*	$NetBSD: hash_page.c,v 1.3 2009/02/09 20:35:22 joerg Exp $	*/
 /*	NetBSD: hash_page.c,v 1.23 2008/09/11 12:58:00 joerg Exp 	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Margo Seltzer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/cdefs.h>
-__RCSID("$NetBSD: hash_page.c,v 1.2 2008/10/28 17:57:36 joerg Exp $");
+__RCSID("$NetBSD: hash_page.c,v 1.3 2009/02/09 20:35:22 joerg Exp $");
 /*
  * PACKAGE:  hashing
+ *
  * DESCRIPTION:
  *	Page manipulation for hashing package.
+ *
  * ROUTINES:
+ *
  * External
  *	__get_page
  *	__add_ovflpage
  * Internal
 @@ -857,29 +857,31 @@ __free_ovflpage(HTAB *hashp, BUFHEAD *ob
 /*
  * Returns:
  *	 0 success
  *	-1 failure
  */
 static int
 open_temp(HTAB *hashp)
+{
 	sigset_t set, oset;
 	char *envtmp;
 	char namestr[PATH_MAX];
 #if HAVE_ISSETUGID
 	if (issetugid())
 		envtmp = NULL;
 	else
 #endif
 		envtmp = getenv("TMPDIR");
 	if (-1 == snprintf(namestr, sizeof(namestr), "%s/_hashXXXXXX",
 	    envtmp ? envtmp : _PATH_TMP))
 		return -1;
 	/* Block signals; make sure file goes away at process exit. */
 	(void)sigfillset(&set);
 	(void)sigprocmask(SIG_BLOCK, &set, &oset);
 	if ((hashp->fp = mkstemp(namestr)) != -1) {
 		(void)unlink(namestr);
 		(void)fcntl(hashp->fp, F_SETFD, FD_CLOEXEC);
+	}

 @@ -1,15 +1,18 @@
 /* nbcompat/config.h.in.  Generated from configure.ac by autoheader.  */
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 #undef GETPGRP_VOID
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 /* Define to 1 if you have the `bcopy' function. */
 @@ -126,35 +129,44 @@
 /* Define to 1 if you have the `group_from_gid' function. */
 #undef HAVE_GROUP_FROM_GID
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 /* Define to 1 if you have the `isblank' function. */
 #undef HAVE_ISBLANK
 /* Define to 1 if you have the `issetugid' function. */
 #undef HAVE_ISSETUGID
 /* Define to 1 if you have the `lchflags' function. */
 #undef HAVE_LCHFLAGS
 /* Define to 1 if you have the `lchmod' function. */
 #undef HAVE_LCHMOD
 /* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 /* Define to 1 if you have the `util' library (-lutil). */
 #undef HAVE_LIBUTIL
 /* Define to 1 if you have the <libutil.h> header file. */
 #undef HAVE_LIBUTIL_H
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 /* Define to 1 if the system has the type `long double'. */
 #undef HAVE_LONG_DOUBLE
 /* Define to 1 if the system has the type `long long'. */
 @@ -531,31 +543,35 @@
 /* The size of `off_t', as computed by sizeof. */
 #undef SIZEOF_OFF_T
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 /* Define to 1 if strerror_r returns char *. */
 #undef STRERROR_R_CHAR_P
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined __BIG_ENDIAN__
+#if defined AC_APPLE_UNIVERSAL_BUILD
-# define WORDS_BIGENDIAN 1
+# if defined __BIG_ENDIAN__
-#elif ! defined __LITTLE_ENDIAN__
+#  define WORDS_BIGENDIAN 1
-# undef WORDS_BIGENDIAN
+# endif
 #else
 # ifndef WORDS_BIGENDIAN
 #  undef WORDS_BIGENDIAN
 # endif
 #endif
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT32_T
 /* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */
 #undef _UINT64_T
 /* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,