basic change to make kerbV build with OpenSSL 0.9.7 -

since the newer OpenSSL's wish to depreciate the libdes
api, and now do not have symbol conflicts with libdes,
we change the build here so that we use the libdes <des.h>
and use libdes rather than libcrypto (this is the same thing
kerberosIV uses)

14 files changed, 13518 insertions, 5323 deletions

diff --git a/kerberosV/src/aclocal.m4 b/kerberosV/src/aclocal.m4
index 309a4ea85d9..9f36b50460c 100644
--- a/kerberosV/src/aclocal.m4
+++ b/kerberosV/src/aclocal.m4
@@ -1,14 +1,15 @@
-dnl ./aclocal.m4 generated automatically by aclocal 1.4a
+# ./aclocal.m4 generated automatically by aclocal 1.4b
 
-dnl Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 dnl $KTH: acinclude.m4,v 1.15 1998/05/23 14:54:53 joda Exp $
 dnl
@@ -49,32 +50,40 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 ])])
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+# serial 3
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_CONFIG_HEADER([$1])
+  AC_OUTPUT_COMMANDS(
+   ifelse(patsubst([$1], [[^ ]], []),
+	  [],
+	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
+  [am_indx=1
+  for am_file in $1; do
+    case " $CONFIG_HEADERS " in
+    *" $am_file "*)
+      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
+      ;;
+    esac
+    am_indx=\`expr \$am_indx + 1\`
+  done])
+])
 
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
 
-# serial 2
+# serial 3
+
+AC_PREREQ([2.13])
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 # -----------------------------------------------------------
@@ -92,12 +101,11 @@ ifdef([AC_PROVIDE_IFELSE],
 
 # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
 # ----------------------------------------------
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
@@ -121,8 +129,8 @@ AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
 AM_MISSING_INSTALL_SH
-dnl We need awk for the "check" target.  The system "awk" is bad on
-dnl some platforms.
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
@@ -141,7 +149,7 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -180,15 +188,15 @@ fi
 rm -f conftest*
 AC_MSG_RESULT(yes)])
 
-dnl AM_MISSING_PROG(NAME, PROGRAM)
-AC_DEFUN(AM_MISSING_PROG, [
+# AM_MISSING_PROG(NAME, PROGRAM)
+AC_DEFUN([AM_MISSING_PROG], [
 AC_REQUIRE([AM_MISSING_HAS_RUN])
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-dnl Like AM_MISSING_PROG, but only looks for install-sh.
-dnl AM_MISSING_INSTALL_SH()
-AC_DEFUN(AM_MISSING_INSTALL_SH, [
+# Like AM_MISSING_PROG, but only looks for install-sh.
+# AM_MISSING_INSTALL_SH()
+AC_DEFUN([AM_MISSING_INSTALL_SH], [
 AC_REQUIRE([AM_MISSING_HAS_RUN])
 if test -z "$install_sh"; then
    install_sh="$ac_aux_dir/install-sh"
@@ -200,13 +208,13 @@ if test -z "$install_sh"; then
 fi
 AC_SUBST(install_sh)])
 
-dnl AM_MISSING_HAS_RUN.
-dnl Define MISSING if not defined so far and test if it supports --run.
-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
+# AM_MISSING_HAS_RUN.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN], [
 test x"${MISSING+set}" = xset || \
-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
-dnl Use eval to expand $SHELL
+  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+# Use eval to expand $SHELL
 if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "
 else
@@ -216,14 +224,14 @@ else
 fi
 ])
 
-dnl See how the compiler implements dependency checking.
-dnl Usage:
-dnl AM_DEPENDENCIES(NAME)
-dnl NAME is "CC", "CXX" or "OBJC".
+# See how the compiler implements dependency checking.
+# Usage:
+# AM_DEPENDENCIES(NAME)
+# NAME is "CC", "CXX" or "OBJC".
 
-dnl We try a few techniques and use that to set a single cache variable.
+# We try a few techniques and use that to set a single cache variable.
 
-AC_DEFUN(AM_DEPENDENCIES,[
+AC_DEFUN([AM_DEPENDENCIES],[
 AC_REQUIRE([AM_SET_DEPDIR])
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
 ifelse([$1],CC,[
@@ -259,10 +267,13 @@ if test -z "$AMDEP"; then
       ;;
     none) break ;;
     esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
     if depmode="$depmode" \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
+       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1; then
       am_cv_[$1]_dependencies_compiler_type="$depmode"
       break
@@ -279,19 +290,22 @@ AC_MSG_RESULT($am_cv_[$1]_dependencies_compiler_type)
 AC_SUBST([$1]DEPMODE)
 ])
 
-dnl Choose a directory name for dependency files.
-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in AM_DEPENDENCIES
 
-AC_DEFUN(AM_SET_DEPDIR,[
+AC_DEFUN([AM_SET_DEPDIR],[
 if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
   DEPDIR=.deps
+  # We redirect because .deps might already exist and be populated.
+  # In this situation we don't want to see an error.
+  rmdir .deps > /dev/null 2>&1
 else
   DEPDIR=_deps
 fi
 AC_SUBST(DEPDIR)
 ])
 
-AC_DEFUN(AM_DEP_TRACK,[
+AC_DEFUN([AM_DEP_TRACK],[
 AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
@@ -316,16 +330,16 @@ subst(AMDEPBACKSLASH)
 popdef([subst])
 ])
 
-dnl Generate code to set up dependency tracking.
-dnl This macro should only be invoked once -- use via AC_REQUIRE.
-dnl Usage:
-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
+# Generate code to set up dependency tracking.
+# This macro should only be invoked once -- use via AC_REQUIRE.
+# Usage:
+# AM_OUTPUT_DEPENDENCY_COMMANDS
 
-dnl
-dnl This code is only required when automatic dependency tracking
-dnl is enabled.  FIXME.  This creates each `.P' file that we will
-dnl need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
 test x"$AMDEP" != x"" ||
 for mf in $CONFIG_FILES; do
@@ -368,9 +382,9 @@ done
 ac_aux_dir="$ac_aux_dir"])])
 
 
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
+# AM_PROG_LEX
+# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+AC_DEFUN([AM_PROG_LEX],
 [AC_REQUIRE([AM_MISSING_HAS_RUN])
 AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
 AC_PROG_LEX
@@ -525,42 +539,24 @@ AC_MSG_RESULT($ac_cv___attribute__)
 ])
 
 
+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
 
-# serial 44 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])])
-AC_DEFUN(_AC_PROG_LIBTOOL,
+# serial 46 AC_PROG_LIBTOOL
+AC_DEFUN([AC_PROG_LIBTOOL],
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
 ])
 
-AC_DEFUN(AC_LIBTOOL_SETUP,
+AC_DEFUN([AC_LIBTOOL_SETUP],
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
@@ -577,10 +573,11 @@ AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
+_LT_AC_PROG_ECHO_BACKSLASH
 # Only perform the check for file, if the check method requires it
-case "$deplibs_check_method" in
+case $deplibs_check_method in
 file_magic*)
-  if test "$file_magic_cmd" = '${MAGIC}'; then
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     AC_PATH_MAGIC
   fi
   ;;
@@ -589,36 +586,22 @@ esac
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
+enable_win32_dll=yes, enable_win32_dll=no)
+
 AC_ARG_ENABLE(libtool-lock,
   [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -649,7 +632,7 @@ case "$host" in
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw*)
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -662,7 +645,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
       DllMain (0, 0, 0);],
       [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
 
-  case "$host/$CC" in
+  case $host/$CC in
   *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
     # old mingw systems require "-dll" to link a DLL, while more recent ones
     # require "-mdll"
@@ -671,7 +654,7 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
     AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
       [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
     CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin*)
+  *-*-cygwin* | *-*-pw32*)
     # cygwin systems need to pass --dll to the linker, and not link
     # crt.o which will require a WinMain@16 definition.
     lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
@@ -679,26 +662,2644 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
   ;;
   ])
 esac
+
+_LT_AC_LTCONFIG_HACK
+
+])
+
+# _LT_AC_CHECK_DLFCN
+# --------------------
+AC_DEFUN(_LT_AC_CHECK_DLFCN,
+[AC_CHECK_HEADERS(dlfcn.h)
+])# _LT_AC_CHECK_DLFCN
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+[symcode='[BCDEGRST]']
+
+# Regexp to match symbols that can be accessed directly from C.
+[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  [symcode='[BCDT]']
+  ;;
+cygwin* | mingw* | pw32*)
+  [symcode='[ABCDGISTW]']
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  ;;
+irix*)
+  [symcode='[BCDEGRST]']
+  ;;
+solaris* | sysv5*)
+  [symcode='[BDT]']
+  ;;
+sysv4)
+  [symcode='[DFNSTU]']
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $host_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  [symcode='[ABCDGISTW]']
+fi
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+[lt_preloaded_symbols[] =]
+{
+EOF
+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  save_LIBS="$LIBS"
+	  save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$save_LIBS"
+	  CFLAGS="$save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    fi
+  else
+    echo "$progname: failed program was:" >&AC_FD_CC
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  global_symbol_to_cdecl=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+# ---------------------------------
+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+[# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+fi
+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn;t interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+                              [AC_DIVERT_PUSH(NOTICE)])
+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  for dir in $PATH /usr/ucb; do
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+AC_DIVERT_POP
+])# _LT_AC_PROG_ECHO_BACKSLASH
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ------------------------------------------------------------------
+AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
+[if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_unknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+# AC_LIBTOOL_DLOPEN_SELF
+# -------------------
+AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
+[if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  *)
+    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
+        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
+          [AC_CHECK_LIB(svld, dlopen,
+	    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+            [AC_CHECK_LIB(dld, shl_load,
+              [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	    ])
+          ])
+        ])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+AC_DEFUN([_LT_AC_LTCONFIG_HACK],
+[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+need_locks="$enable_libtool_lock"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+if test x"$host" != x"$build"; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+case $host_os in
+linux-gnu*) ;;
+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+fi
+
+# Allow CC to be a program name with arguments.
+set dummy $CC
+compiler="[$]2"
+
+AC_MSG_CHECKING([for objdir])
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+AC_MSG_RESULT($objdir)
+
+
+AC_ARG_WITH(pic, 
+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+pic_mode="$withval", pic_mode=default)
+test -z "$pic_mode" && pic_mode=default
+
+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+# in isolation, and that seeing it set (from the cache) indicates that
+# the associated values are set (in the cache) correctly too.
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+AC_CACHE_VAL(lt_cv_prog_cc_pic,
+[ lt_cv_prog_cc_pic=
+  lt_cv_prog_cc_shlib=
+  lt_cv_prog_cc_wl=
+  lt_cv_prog_cc_static=
+  lt_cv_prog_cc_no_builtin=
+  lt_cv_prog_cc_can_build_shared=$can_build_shared
+
+  if test "$GCC" = yes; then
+    lt_cv_prog_cc_wl='-Wl,'
+    lt_cv_prog_cc_static='-static'
+
+    case $host_os in
+    aix*)
+      # Below there is a dirty hack to force normal static linking with -ldl
+      # The problem is because libdl dynamically linked with both libc and
+      # libC (AIX C++ library), which obviously doesn't included in libraries
+      # list by gcc. This cause undefined symbols with -static flags.
+      # This hack allows C programs to be linked with "-static -ldl", but
+      # we not sure about C++ programs.
+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_cv_prog_cc_pic='-fno-common'
+      ;;
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	 lt_cv_prog_cc_pic=-Kconform_pic
+      fi
+      ;;
+    *)
+      lt_cv_prog_cc_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for PIC flags for the system compiler.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+        # AIX 5 now supports IA64 processor
+        lt_cv_prog_cc_static='-Bstatic'
+        lt_cv_prog_cc_wl='-Wl,'
+      else
+        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+      lt_cv_prog_cc_pic='+Z'
+      ;;
+
+    irix5* | irix6*)
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      # PIC (with -KPIC) is the default.
+      ;;
+
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+
+    newsos6)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      # All OSF/1 code is PIC.
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_cv_prog_cc_pic='-Kpic'
+      lt_cv_prog_cc_static='-dn'
+      lt_cv_prog_cc_shlib='-belf'
+      ;;
+
+    solaris*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Wl,'
+      ;;
+
+    sunos4*)
+      lt_cv_prog_cc_pic='-PIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Qoption ld '
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      if test "x$host_vendor" = xsni; then
+        lt_cv_prog_cc_wl='-LD'
+      else
+        lt_cv_prog_cc_wl='-Wl,'
+      fi
+      ;;
+
+    uts4*)
+      lt_cv_prog_cc_pic='-pic'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_cv_prog_cc_pic='-Kconform_pic'
+	lt_cv_prog_cc_static='-Bstatic'
+      fi
+      ;;
+
+    *)
+      lt_cv_prog_cc_can_build_shared=no
+      ;;
+    esac
+  fi
+])
+if test -z "$lt_cv_prog_cc_pic"; then
+  AC_MSG_RESULT([none])
+else
+  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
+
+  # Check to make sure the pic_flag actually works.
+  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
+  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+    AC_TRY_COMPILE([], [], [dnl
+      case $host_os in
+      hpux9* | hpux10* | hpux11*)
+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+	# they create non-PIC objects.  So, if there were any warnings, we
+	# assume that PIC is not supported.
+	if test -s conftest.err; then
+	  lt_cv_prog_cc_pic_works=no
+	else
+	  lt_cv_prog_cc_pic_works=yes
+	fi
+	;;
+      *)
+	lt_cv_prog_cc_pic_works=yes
+	;;
+      esac
+    ], [dnl
+      lt_cv_prog_cc_pic_works=no
+    ])
+    CFLAGS="$save_CFLAGS"
+  ])
+
+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+    lt_cv_prog_cc_pic=
+    lt_cv_prog_cc_can_build_shared=no
+  else
+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+  fi
+
+  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
+fi
+
+# Check for any special shared library compilation flags.
+if test -n "$lt_cv_prog_cc_shlib"; then
+  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
+  if echo "$old_CC $old_CFLAGS " | [egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]"] >/dev/null; then :
+  else
+   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
+    lt_cv_prog_cc_can_build_shared=no
+  fi
+fi
+
+AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
+AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
+  lt_cv_prog_cc_static_works=no
+  save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
+  LDFLAGS="$save_LDFLAGS"
+])
+
+# Belt *and* braces to stop my trousers falling down:
+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
+
+pic_flag="$lt_cv_prog_cc_pic"
+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+wl="$lt_cv_prog_cc_wl"
+link_static_flag="$lt_cv_prog_cc_static"
+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+can_build_shared="$lt_cv_prog_cc_can_build_shared"
+
+
+# Check to see if options -o and -c are simultaneously supported by compiler
+AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
+AC_CACHE_VAL([lt_cv_compiler_c_o], [
+$rm -r conftest 2>/dev/null
+mkdir conftest
+cd conftest
+echo "int some_variable = 0;" > conftest.$ac_ext
+mkdir out
+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+# that will create temporary files in the current directory regardless of
+# the output directory.  Thus, making CWD read-only will cause this test
+# to fail, enabling locking or at least warning the user not to do parallel
+# builds.
+chmod -w .
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+compiler_c_o=no
+if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+  # The compiler can only warn and ignore the option if not recognized
+  # So say no if there are warnings
+  if test -s out/conftest.err; then
+    lt_cv_compiler_c_o=no
+  else
+    lt_cv_compiler_c_o=yes
+  fi
+else
+  # Append any errors to the config.log.
+  cat out/conftest.err 1>&AC_FD_CC
+  lt_cv_compiler_c_o=no
+fi
+CFLAGS="$save_CFLAGS"
+chmod u+w .
+$rm conftest* out/*
+rmdir out
+cd ..
+rmdir conftest
+$rm -r conftest 2>/dev/null
 ])
+compiler_c_o=$lt_cv_compiler_c_o
+AC_MSG_RESULT([$compiler_c_o])
+
+if test x"$compiler_c_o" = x"yes"; then
+  # Check to see if we can write to a .lo
+  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
+  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
+  lt_cv_compiler_o_lo=no
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -c -o conftest.lo"
+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      lt_cv_compiler_o_lo=no
+    else
+      lt_cv_compiler_o_lo=yes
+    fi
+  ])
+  CFLAGS="$save_CFLAGS"
+  ])
+  compiler_o_lo=$lt_cv_compiler_o_lo
+  AC_MSG_RESULT([$compiler_c_lo])
+else
+  compiler_o_lo=no
+fi
+
+# Check to see if we can do hard links to lock some files if needed
+hard_links="nottested"
+if test "$compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+if test "$GCC" = yes; then
+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+  compiler_rtti_exceptions=no
+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      compiler_rtti_exceptions=no
+    else
+      compiler_rtti_exceptions=yes
+    fi
+  ])
+  CFLAGS="$save_CFLAGS"
+  AC_MSG_RESULT([$compiler_rtti_exceptions])
+
+  if test "$compiler_rtti_exceptions" = "yes"; then
+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+  else
+    no_builtin_flag=' -fno-builtin'
+  fi
+fi
+
+# See if the linker supports building shared libraries.
+AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
+
+allow_undefined_flag=
+no_undefined_flag=
+need_lib_prefix=unknown
+need_version=unknown
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+archive_cmds=
+archive_expsym_cmds=
+old_archive_from_new_cmds=
+old_archive_from_expsyms_cmds=
+export_dynamic_flag_spec=
+whole_archive_flag_spec=
+thread_safe_flag_spec=
+hardcode_into_libs=no
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+hardcode_shlibpath_var=unsupported
+runpath_var=
+link_all_deplibs=unknown
+always_export_symbols=no
+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+# include_expsyms should be a list of space-separated symbols to be *always*
+# included in the symbol list
+include_expsyms=
+# exclude_expsyms can be an egrep regular expression of symbols to exclude
+# it will be wrapped by ` (' and `)$', so one must not match beginning or
+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+# as well as any symbol that contains `d'.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+# platforms (ab)use it in PIC code, but their linkers get confused if
+# the symbol is explicitly referenced.  Since portable code cannot
+# rely on this symbol name, it's probably fine to never include it in
+# preloaded symbol tables.
+extract_expsyms_cmds=
+
+case $host_os in
+cygwin* | mingw* | pw32* )
+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+  # When not using gcc, we currently assume that we are using
+  # Microsoft Visual C++.
+  if test "$GCC" != yes; then
+    with_gnu_ld=no
+  fi
+  ;;
+
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # If archive_cmds runs LD, not CC, wlarc should be empty
+  wlarc='${wl}'
+
+  # See if GNU ld supports shared libraries.
+  case $host_os in
+  aix3* | aix4* | aix5*)
+    # On AIX, the GNU linker is very broken
+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+    ld_shlibs=no
+    cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+
+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+    # that the semantics of dynamic libraries on AmigaOS, at least up
+    # to version 4, is to share data among multiple programs linked
+    # with the same dynamic library.  Since this doesn't match the
+    # behavior of shared libraries on other platforms, we can use
+    # them.
+    ld_shlibs=no
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec='-L$libdir'
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+
+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+      else $CC -o impgen impgen.c ; fi)~
+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+
+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+
+    # cygwin and mingw dlls have different entry points and sets of symbols
+    # to exclude.
+    # FIXME: what about values for MSVC?
+    dll_entry=__cygwin_dll_entry@12
+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
+    case $host_os in
+    mingw*)
+      # mingw values
+      dll_entry=_DllMainCRTStartup@12
+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
+      ;;
+    esac
+
+    # mingw and cygwin differ, and it's simplest to just exclude the union
+    # of the two symbol sets.
+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
+
+    # recent cygwin and mingw systems supply a stub DllMain which the user
+    # can override, but on older systems we have to supply one (in ltdll.c)
+    if test "x$lt_cv_need_dllmain" = "xyes"; then
+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+    else
+      ltdll_obj=
+      ltdll_cmds=
+    fi
+
+    # Extract the symbol export list from an `--export-all' def file,
+    # then regenerate the def file from the symbol export list, so that
+    # the compiled dll only exports the symbol export list.
+    # Be careful not to strip the DATA tag left be newer dlltools.
+    export_symbols_cmds="$ltdll_cmds"'
+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+      [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
+
+    # If the export-symbols file already is a .def file (1st line
+    # is EXPORTS), use it as is.
+    # If DATA tags from a recent dlltool are present, honour them!
+    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
+        cp $export_symbols $output_objdir/$soname-def;
+      else
+        echo EXPORTS > $output_objdir/$soname-def;
+        _lt_hint=1;
+        cat $export_symbols | while read symbol; do
+         set dummy \$symbol;
+         case \[$]# in
+           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+         esac;
+         _lt_hint=`expr 1 + \$_lt_hint`;
+        done;
+      fi~
+      '"$ltdll_cmds"'
+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+      wlarc=
+    else
+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    fi
+    ;;
+
+  solaris* | sysv5*)
+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      ld_shlibs=no
+      cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  sunos4*)
+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    wlarc=
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+  esac
+
+  if test "$ld_shlibs" = yes; then
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    case $host_os in
+    cygwin* | mingw* | pw32*)
+      # dlltool doesn't understand --whole-archive et. al.
+      whole_archive_flag_spec=
+      ;;
+    *)
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+	whole_archive_flag_spec=
+      fi
+      ;;
+    esac
+  fi
+else
+  # PORTME fill in a description of your system's linker (not GNU ld)
+  case $host_os in
+  aix3*)
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+    # Note: this linker hardcodes the directories in LIBPATH if there
+    # are no directories specified by -L.
+    hardcode_minus_L=yes
+    if test "$GCC" = yes && test -z "$link_static_flag"; then
+      # Neither direct hardcoding nor static linking is supported with a
+      # broken collect2.
+      hardcode_direct=unsupported
+    fi
+    ;;
+
+  aix4* | aix5*)
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    archive_cmds=''
+    hardcode_libdir_separator=':'
+    if test "$GCC" = yes; then
+      collect2name=`${CC} -print-prog-name=collect2`
+      if test -f "$collect2name" && \
+	 strings "$collect2name" | grep resolve_lib_name >/dev/null
+      then
+	# We have reworked collect2
+	hardcode_direct=yes
+      else
+        # We have old collect2
+        hardcode_direct=unsupported
+        # It fails to find uninstalled libraries when the uninstalled
+        # path is not listed in the libpath.  Setting hardcode_minus_L
+        # to unsupported forces relinking
+        hardcode_minus_L=yes
+        hardcode_libdir_flag_spec='-L$libdir'
+        hardcode_libdir_separator=
+      fi
+      shared_flag='-shared'
+    else
+      if test "$host_cpu" = ia64; then
+        shared_flag='-G'
+      else
+        shared_flag='${wl}-bM:SRE'
+      fi
+      hardcode_direct=yes
+    fi
+
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      # Test if we are trying to use run time linking, or normal AIX style linking.
+      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
+      aix_use_runtimelinking=no
+      for ld_flag in $LDFLAGS; do
+        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
+          aix_use_runtimelinking=yes
+          break
+        fi
+      done
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+    # It seems that -bexpall can do strange things, so it is better to
+    # generate a list of symbols to export.
+    always_export_symbols=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+      allow_undefined_flag=' -Wl,-G'
+      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+    else
+      if test "$host_cpu" = ia64; then
+        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+       allow_undefined_flag="-znodefs"
+        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+        # Warning - without using the other run time loading flags, -berok will
+        #           link without error, but may produce a broken library.
+        allow_undefined_flag='${wl}-berok"
+        # This is a bit strange, but is similar to how AIX traditionally builds
+        # it's shared libraries.
+        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+      fi
+    fi
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    # see comment about different semantics on the GNU ld section
+    ld_shlibs=no
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec=' '
+    allow_undefined_flag=unsupported
+    # Tell ltmain to make .lib files, not .a files.
+    libext=lib
+    # FIXME: Setting linknames here is a bad hack.
+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+    # The linker will automatically build a .lib file if we build a DLL.
+    old_archive_from_new_cmds='true'
+    # FIXME: Should let the user specify the lib program.
+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+    fix_srcfile_path='`cygpath -w "$srcfile"`'
+    ;;
+
+  darwin* | rhapsody*)
+    allow_undefined_flag='-undefined suppress'
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    # We need to add '_' to the symbols in $export_symbols first
+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load $convenience'
+    ;;
+
+  freebsd1*)
+    ld_shlibs=no
+    ;;
+
+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+  # support.  Future versions do this automatically, but an explicit c++rt0.o
+  # does not break anything, and helps significantly (at the cost of a little
+  # extra space).
+  freebsd2.2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+  freebsd2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+  freebsd*)
+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  hpux9* | hpux10* | hpux11*)
+    case $host_os in
+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+    esac
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
+    export_dynamic_flag_spec='${wl}-E'
+    ;;
+
+  irix5* | irix6*)
+    if test "$GCC" = yes; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    link_all_deplibs=yes
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    else
+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+    fi
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  newsos6)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    hardcode_direct=yes
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_shlibpath_var=no
+    ;;
+
+  openbsd*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  os2*)
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    allow_undefined_flag=unsupported
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    ;;
+
+  osf3*)
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    ;;
+
+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+      #Both c and cxx compiler support -rpath directly
+      hardcode_libdir_flag_spec='-rpath $libdir'
+    fi
+    hardcode_libdir_separator=:
+    ;;
+
+  sco3.2v5*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_shlibpath_var=no
+    runpath_var=LD_RUN_PATH
+    hardcode_runpath_var=yes
+    ;;
+
+  solaris*)
+    no_undefined_flag=' -z defs'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_shlibpath_var=no
+    case $host_os in
+    [solaris2.[0-5] | solaris2.[0-5].*]) ;;
+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+    esac
+    link_all_deplibs=yes
+    ;;
+
+  sunos4*)
+    if test "x$host_vendor" = xsequent; then
+      # Use $CC to link under sequent, because it throws in some extra .o
+      # files that make .init and .fini sections work.
+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+    else
+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+    fi
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4)
+    if test "x$host_vendor" = xsno; then
+      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+      hardcode_direct=yes # is this really true???
+    else
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+    fi
+    runpath_var='LD_RUN_PATH'
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4.3*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_shlibpath_var=no
+    export_dynamic_flag_spec='-Bexport'
+    ;;
+
+  sysv5*)
+    no_undefined_flag=' -z text'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+    hardcode_libdir_flag_spec=
+    hardcode_shlibpath_var=no
+    runpath_var='LD_RUN_PATH'
+    ;;
+
+  uts4*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_shlibpath_var=no
+    ;;
+
+  dgux*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4*MP*)
+    if test -d /usr/nec; then
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ld_shlibs=yes
+    fi
+    ;;
+
+  sysv4.2uw2*)
+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_minus_L=no
+    hardcode_shlibpath_var=no
+    hardcode_runpath_var=yes
+    runpath_var=LD_RUN_PATH
+    ;;
+
+  sysv5uw7* | unixware7*)
+    no_undefined_flag='${wl}-z ${wl}text'
+    if test "$GCC" = yes; then
+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+    else
+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+    fi
+    runpath_var='LD_RUN_PATH'
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    ld_shlibs=no
+    ;;
+  esac
+fi
+AC_MSG_RESULT([$ld_shlibs])
+test "$ld_shlibs" = no && can_build_shared=no
+
+# Check hardcoding attributes.
+AC_MSG_CHECKING([how to hardcode library paths into programs])
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var"; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$hardcode_shlibpath_var" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+AC_MSG_RESULT([$hardcode_action])
+
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+# PORTME Fill in your ld.so characteristics
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}.so$major'
+  ;;
+
+aix4* | aix5*)
+  version_type=linux
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      [ aix4 | aix4.[01] | aix4.[01].*)]
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+           echo ' yes '
+           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+        :
+      else
+        can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
+      # lib<name>.a to let people know that these are not typical AIX shared libraries.
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}.so$major'
+    fi
+    shlibpath_var=LIBPATH
+    deplibs_check_method=pass_all
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}.so'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  export_dynamic_flag_spec=-rdynamic
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  need_version=no
+  need_lib_prefix=no
+  case $GCC,$host_os in
+  yes,cygwin*)
+    library_names_spec='$libname.dll.a'
+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog .libs/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    ;;
+  yes,mingw*)
+    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+    ;;
+  yes,pw32*)
+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    ;;
+  *)
+    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  *)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  dynamic_linker="$host_os dld.sl"
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  shlibpath_var=SHLIB_PATH
+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+  soname_spec='${libname}${release}.sl$major'
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6*)
+  version_type=irix
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+  case $host_os in
+  irix5*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+    soname_spec='${libname}${release}.so$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+    need_version=no
+  fi
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+os2*)
+  libname_spec='$name'
+  need_lib_prefix=no
+  library_names_spec='$libname.dll $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_version=no
+  soname_spec='${libname}${release}.so'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+    soname_spec='$libname.so.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+# Report the final consequences.
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+if test "$hardcode_action" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+AC_LIBTOOL_DLOPEN_SELF
+
+if test "$enable_shared" = yes && test "$GCC" = yes; then
+  case $archive_cmds in
+  *'~'*)
+    # FIXME: we may have to deal with multi-command sequences.
+    ;;
+  '$CC '*)
+    # Test whether the compiler implicitly links with -lc since on some
+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+    # to ld, don't add -lc before -lgcc.
+    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
+    [$rm conftest*
+    echo 'static int dummy;' > conftest.$ac_ext
+
+    if AC_TRY_EVAL(ac_compile); then
+      soname=conftest
+      lib=conftest
+      libobjs=conftest.$ac_objext
+      deplibs=
+      wl=$lt_cv_prog_cc_wl
+      compiler_flags=-v
+      linker_flags=-v
+      verstring=
+      output_objdir=.
+      libname=conftest
+      save_allow_undefined_flag=$allow_undefined_flag
+      allow_undefined_flag=
+      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+      then
+	lt_cv_archive_cmds_need_lc=no
+      else
+	lt_cv_archive_cmds_need_lc=yes
+      fi
+      allow_undefined_flag=$save_allow_undefined_flag
+    else
+      cat conftest.err 1>&5
+    fi])
+    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
+    ;;
+  esac
+fi
+need_lc=${lt_cv_archive_cmds_need_lc-yes}
+
+# The second clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  :
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+if test -f "$ltmain"; then
+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+  $rm -f "${ofile}T"
+
+  echo creating $ofile
+
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS \
+    AR AR_FLAGS CC LD LN_S NM SHELL \
+    reload_flag reload_cmds wl \
+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+    library_names_spec soname_spec \
+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+    old_striplib striplib file_magic_cmd export_symbols_cmds \
+    deplibs_check_method allow_undefined_flag no_undefined_flag \
+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
+
+    case $var in
+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  cat <<__EOF__ > "${ofile}T"
+#! $SHELL
+
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$need_lc
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# The default C compiler.
+CC=$lt_CC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_wl
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_pic_flag
+pic_mode=$pic_mode
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_compiler_c_o
+
+# Can we write directly to a .lo ?
+compiler_o_lo=$lt_compiler_o_lo
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_link_static_flag
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# ### END LIBTOOL CONFIG
+
+__EOF__
+
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "${ofile}T"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | os2*)
+    cat <<'EOF' >> "${ofile}T"
+      # This is a source program that is used to create dlls on Windows
+      # Don't remove nor modify the starting and closing comments
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+        # This is a source program that is used to create import libraries
+        # on Windows for dlls which lack them. Don't remove nor modify the
+        # starting and closing comments
+# /* impgen.c starts here */
+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+#
+#  This file is part of GNU libtool.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  */
+#
+# #include <stdio.h>		/* for printf() */
+# #include <unistd.h>		/* for open(), lseek(), read() */
+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+# #include <string.h>		/* for strdup() */
+#
+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+# #ifndef O_BINARY
+# #define O_BINARY 0
+# #endif
+#
+# static unsigned int
+# pe_get16 (fd, offset)
+#      int fd;
+#      int offset;
+# {
+#   unsigned char b[2];
+#   lseek (fd, offset, SEEK_SET);
+#   read (fd, b, 2);
+#   return b[0] + (b[1]<<8);
+# }
+#
+# static unsigned int
+# pe_get32 (fd, offset)
+#     int fd;
+#     int offset;
+# {
+#   unsigned char b[4];
+#   lseek (fd, offset, SEEK_SET);
+#   read (fd, b, 4);
+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# static unsigned int
+# pe_as32 (ptr)
+#      void *ptr;
+# {
+#   unsigned char *b = ptr;
+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# int
+# main (argc, argv)
+#     int argc;
+#     char *argv[];
+# {
+#     int dll;
+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+#     unsigned long name_rvas, nexp;
+#     unsigned char *expdata, *erva;
+#     char *filename, *dll_name;
+#
+#     filename = argv[1];
+#
+#     dll = open(filename, O_RDONLY|O_BINARY);
+#     if (dll < 1)
+# 	return 1;
+#
+#     dll_name = filename;
+#
+#     for (i=0; filename[i]; i++)
+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+# 	    dll_name = filename + i +1;
+#
+#     pe_header_offset = pe_get32 (dll, 0x3c);
+#     opthdr_ofs = pe_header_offset + 4 + 20;
+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
+#
+#     if (num_entries < 1) /* no exports */
+# 	return 1;
+#
+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+#     secptr = (pe_header_offset + 4 + 20 +
+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
+#
+#     expptr = 0;
+#     for (i = 0; i < nsections; i++)
+#     {
+# 	char sname[8];
+# 	unsigned long secptr1 = secptr + 40 * i;
+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+# 	lseek(dll, secptr1, SEEK_SET);
+# 	read(dll, sname, 8);
+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+# 	{
+# 	    expptr = fptr + (export_rva - vaddr);
+# 	    if (export_rva + export_size > vaddr + vsize)
+# 		export_size = vsize - (export_rva - vaddr);
+# 	    break;
+# 	}
+#     }
+#
+#     expdata = (unsigned char*)malloc(export_size);
+#     lseek (dll, expptr, SEEK_SET);
+#     read (dll, expdata, export_size);
+#     erva = expdata - export_rva;
+#
+#     nexp = pe_as32 (expdata+24);
+#     name_rvas = pe_as32 (expdata+32);
+#
+#     printf ("EXPORTS\n");
+#     for (i = 0; i<nexp; i++)
+#     {
+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+#     }
+#
+#     return 0;
+# }
+# /* impgen.c ends here */
+
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
+
+  mv -f "${ofile}T" "$ofile" || \
+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
+  chmod +x "$ofile"
+fi
+
+])# _LT_AC_LTCONFIG_HACK
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -717,21 +3318,22 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -750,7 +3352,8 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -758,14 +3361,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -784,30 +3387,32 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
 # AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
 # AC_LIBTOOL_PICMODE - implement the --with-pic flag
 # Usage: AC_LIBTOOL_PICMODE[(MODE)]
 #   Where MODE is either `yes' or `no'.  If omitted, it defaults to
 #   `both'.
-AC_DEFUN(AC_LIBTOOL_PICMODE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 pic_mode=ifelse($#,1,$1,default)])
 
 
 # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN(AC_PATH_TOOL_PREFIX,
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC,
-[case "$MAGIC" in
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
   /*)
-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
   ?:/*)
-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
   ;;
   *)
-  ac_save_MAGIC="$MAGIC"
+  ac_save_MAGIC_CMD="$MAGIC_CMD"
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
@@ -816,12 +3421,12 @@ dnl not every word.  This closes a longstanding sh security hole.
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC="$ac_dir/$1"
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
       if test -n "$file_magic_test_file"; then
-	case "$deplibs_check_method" in
+	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC="$lt_cv_path_MAGIC"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    egrep "$file_magic_regex" > /dev/null; then
 	    :
@@ -845,12 +3450,12 @@ EOF
     fi
   done
   IFS="$ac_save_ifs"
-  MAGIC="$ac_save_MAGIC"
+  MAGIC_CMD="$ac_save_MAGIC_CMD"
   ;;
 esac])
-MAGIC="$lt_cv_path_MAGIC"
-if test -n "$MAGIC"; then
-  AC_MSG_RESULT($MAGIC)
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
 else
   AC_MSG_RESULT(no)
 fi
@@ -858,21 +3463,21 @@ fi
 
 
 # AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN(AC_PATH_MAGIC,
+AC_DEFUN([AC_PATH_MAGIC],
 [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
 AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC"; then
+if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
   else
-    MAGIC=:
+    MAGIC_CMD=:
   fi
 fi
 ])
 
 
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
+AC_DEFUN([AC_PROG_LD],
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -880,7 +3485,7 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
+if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
   case $host in
@@ -890,12 +3495,10 @@ if test "$ac_cv_prog_gcc" = yes; then
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   esac
-  case "$ac_prog" in
+  case $ac_prog in
     # Accept absolute paths.
-changequote(,)dnl
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-changequote([,])dnl
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -917,17 +3520,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(ac_cv_path_LD,
+AC_CACHE_VAL(lt_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -936,9 +3539,9 @@ AC_CACHE_VAL(ac_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$ac_cv_path_LD"
+LD="$lt_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -948,20 +3551,21 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+# AC_PROG_LD_GNU -
+AC_DEFUN([AC_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
+  lt_cv_prog_gnu_ld=yes
 else
-  ac_cv_prog_gnu_ld=no
+  lt_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$ac_cv_prog_gnu_ld
+with_gnu_ld=$lt_cv_prog_gnu_ld
 ])
 
 # AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
 #   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN(AC_PROG_LD_RELOAD_FLAG,
+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
 [AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
 [lt_cv_ld_reload_flag='-r'])
 reload_flag=$lt_cv_ld_reload_flag
@@ -970,10 +3574,10 @@ test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
 [AC_CACHE_CHECK([how to recognise dependant libraries],
 lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='${MAGIC}'
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -982,13 +3586,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
+# ['file_magic [regex]'] -- check by looking for files in library path
 # which responds to the $file_magic_cmd with a given egrep regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
 
-case "$host_os" in
-aix4*)
+case $host_os in
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -997,25 +3601,36 @@ beos*)
   ;;
 
 bsdi4*)
-  changequote(,)dnl
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  changequote([, ])dnl
+  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw*)
+cygwin* | mingw* | pw32*)
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  case "$host_os" in
+  rhapsody* | darwin1.[012])
+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+    ;;
+  *) # Darwin 1.3 on
+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    ;;
+  esac
   ;;
 
 freebsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
+    case $host_cpu in
     i*86 )
-      changequote(,)dnl
-      lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-      changequote([, ])dnl
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -1029,30 +3644,27 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*)
-  # TODO:  Does this work for hpux-11 too?
-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+hpux10.20*|hpux11*)
+  [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=/usr/lib/libc.sl
   ;;
 
 irix5* | irix6*)
-  case "$host_os" in
+  case $host_os in
   irix5*)
     # this will be overridden with pass_all, but let us keep it just in case
     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
     ;;
   *)
-    case "$LD" in
+    case $LD in
     *-32|*"-32 ") libmagic=32-bit;;
     *-n32|*"-n32 ") libmagic=N32;;
     *-64|*"-64 ") libmagic=64-bit;;
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-    changequote(,)dnl
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    changequote([, ])dnl
+    [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
     ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
@@ -1061,29 +3673,30 @@ irix5* | irix6*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  case "$host_cpu" in
+  case $host_cpu in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
-    changequote(,)dnl
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-    changequote([, ])dnl
+    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
   esac
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
   else
-    changequote(,)dnl
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-    changequote([, ])dnl
-    lt_cv_file_magic_cmd='/usr/bin/file -L'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
   fi
   ;;
 
+newos6*)
+  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case
   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -1100,16 +3713,27 @@ solaris*)
   lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
+[sysv5uw[78]* | sysv4*uw2*)]
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case "$host_vendor" in
+  case $host_vendor in
+  motorola)
+    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
     ;;
-  motorola)
-    changequote(,)dnl
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    changequote([, ])dnl
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
+    lt_cv_file_magic_test_file=/lib/libc.so
     ;;
   esac
   ;;
@@ -1121,12 +3745,12 @@ deplibs_check_method=$lt_cv_deplibs_check_method
 
 
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
+AC_DEFUN([AC_PROG_NM],
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
+AC_CACHE_VAL(lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  ac_cv_path_NM="$NM"
+  lt_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
@@ -1136,31 +3760,32 @@ else
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$tmp_nm -B"
+      # Tru64's nm complains that /dev/null is an invalid object file
+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+	lt_cv_path_NM="$tmp_nm -B"
 	break
       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$tmp_nm -p"
+	lt_cv_path_NM="$tmp_nm -p"
 	break
       else
-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi])
-NM="$ac_cv_path_NM"
+NM="$lt_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM,
+AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case "$host" in
-*-*-beos* | *-*-cygwin*)
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1183,8 +3808,9 @@ esac
 # '${top_srcdir}/' (note the single quotes!).  If your package is not
 # flat and you're not using automake, define top_builddir and
 # top_srcdir appropriately in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case "$enable_ltdl_convenience" in
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case $enable_ltdl_convenience in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
@@ -1204,7 +3830,8 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 # not flat and you're not using automake, define top_builddir and
 # top_srcdir appropriately in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1224,17 +3851,17 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   fi
 ])
 
-dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
 
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
 
 dnl $KTH: wflags.m4,v 1.3 1999/03/11 12:11:41 joda Exp $
 dnl
@@ -1258,7 +3885,7 @@ AC_SUBST(WFLAGS_NOUNUSED)dnl
 AC_SUBST(WFLAGS_NOIMPLICITINT)dnl
 ])
 
-dnl $KTH: db.m4,v 1.1 2000/07/19 11:21:07 joda Exp $
+dnl $KTH: db.m4,v 1.4 2001/09/03 04:26:18 assar Exp $
 dnl
 dnl tests for various db libraries
 dnl
@@ -1269,37 +3896,155 @@ if test "$withval" = no; then
 	berkeley_db=""
 fi
 ])
+
+db_type=unknown
+
 if test "$berkeley_db"; then
+
   AC_CHECK_HEADERS([				\
 	db.h					\
 	db_185.h				\
   ])
-fi
 
-AC_FIND_FUNC_NO_LIBS2(dbopen, $berkeley_db, [
-#include <stdio.h>
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#endif
-],[NULL, 0, 0, 0, NULL])
+dnl db_create is used by db3
 
-AC_FIND_FUNC_NO_LIBS(dbm_firstkey, $berkeley_db gdbm ndbm)
-AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db)
+  AC_FIND_FUNC_NO_LIBS(db_create, $berkeley_db, [
+  #include <stdio.h>
+  #include <db.h>
+  ],[NULL, NULL, 0])
 
-DBLIB="$LIB_dbopen"
-if test "$LIB_dbopen" != "$LIB_db_create"; then
-        DBLIB="$DBLIB $LIB_db_create"
-fi
-if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then
-	DBLIB="$DBLIB $LIB_dbm_firstkey"
-fi
-AC_SUBST(DBLIB)dnl
+  if test "$ac_cv_func_db_create" = "yes"; then
+    db_type=db3
+    if test "$ac_cv_funclib_db_create" != "yes"; then
+      DBLIB="$ac_cv_funclib_db_create"
+    else
+      DBLIB=""
+    fi
+    AC_DEFINE(HAVE_DB3, 1, [define if you have a berkeley db3 library])
+  else
+
+dnl dbopen is used by db1/db2
+
+    AC_FIND_FUNC_NO_LIBS(dbopen, $berkeley_db, [
+    #include <stdio.h>
+    #if defined(HAVE_DB_185_H)
+    #include <db_185.h>
+    #elif defined(HAVE_DB_H)
+    #include <db.h>
+    #else
+    #error no db.h
+    #endif
+    ],[NULL, 0, 0, 0, NULL])
+
+    if test "$ac_cv_func_dbopen" = "yes"; then
+      db_type=db1
+      if test "$ac_cv_funclib_dbopen" != "yes"; then
+        DBLIB="$ac_cv_funclib_dbopen"
+      else
+        DBLIB=""
+      fi
+      AC_DEFINE(HAVE_DB1, 1, [define if you have a berkeley db1/2 library])
+    fi
+  fi
+
+dnl test for ndbm compatability
+
+  AC_FIND_FUNC_NO_LIBS2(dbm_firstkey, $ac_cv_funclib_dbopen $ac_cv_funclib_db_create, [
+  #include <stdio.h>
+  #define DB_DBM_HSEARCH 1
+  #include <db.h>
+  DBM *dbm;
+  ],[NULL])
+
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+    AC_DEFINE(HAVE_DB_NDBM, 1, [define if you have ndbm compat in db])
+  else
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+  fi
 
+fi # berkeley db
+
+if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
+
+  AC_CHECK_HEADERS([				\
+	dbm.h					\
+	ndbm.h					\
+  ])
+
+  AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
+  #include <stdio.h>
+  #if defined(HAVE_NDBM_H)
+  #include <ndbm.h>
+  #elif defined(HAVE_DBM_H)
+  #include <dbm.h>
+  #else
+  #error no ndbm.h
+  #endif
+  DBM *dbm;
+  ],[NULL])
+
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+    AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
+    if test "$db_type" = "unknown"; then
+      db_type=ndbm
+      DBLIB="$LIB_NDBM"
+    fi
+  else
+
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+
+    AC_CHECK_HEADERS([				\
+	  gdbm/ndbm.h				\
+    ])
+
+    AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [
+    #include <stdio.h>
+    #include <gdbm/ndbm.h>
+    DBM *dbm;
+    ],[NULL])
+
+    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+      else
+	LIB_NDBM=""
+      fi
+      AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
+      if test "$db_type" = "unknown"; then
+	db_type=ndbm
+	DBLIB="$LIB_NDBM"
+      fi
+    fi
+  fi
+
+fi # unknown
+AC_SUBST(DBLIB)dnl
+AC_SUBST(LIB_NDBM)dnl
 ])
 
-dnl $KTH: find-func-no-libs2.m4,v 1.4 2000/07/15 18:10:19 joda Exp $
+dnl $KTH: find-func-no-libs.m4,v 1.5 1999/10/30 21:08:18 assar Exp $
+dnl
+dnl
+dnl Look for function in any of the specified libraries
+dnl
+
+dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
+AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [
+AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])
+
+dnl $KTH: find-func-no-libs2.m4,v 1.6 2001/09/01 10:57:32 assar Exp $
 dnl
 dnl
 dnl Look for function in any of the specified libraries
@@ -1314,11 +4059,13 @@ AC_CACHE_VAL(ac_cv_funclib_$1,
 if eval "test \"\$ac_cv_func_$1\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in $2; do
-		if test -n "$ac_lib"; then 
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS="$6 $ac_lib $5 $ac_save_LIBS"
 		AC_TRY_LINK([$3],[$1($4)],eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break)
 	done
@@ -1361,17 +4108,7 @@ esac
 AC_SUBST(LIB_$1)
 ])
 
-dnl $KTH: find-func-no-libs.m4,v 1.5 1999/10/30 21:08:18 assar Exp $
-dnl
-dnl
-dnl Look for function in any of the specified libraries
-dnl
-
-dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
-AC_DEFUN(AC_FIND_FUNC_NO_LIBS, [
-AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])
-
-dnl $KTH: roken-frag.m4,v 1.19 2000/12/15 14:29:54 assar Exp $
+dnl $KTH: roken-frag.m4,v 1.30 2001/08/27 23:06:50 assar Exp $
 dnl
 dnl some code to get roken working
 dnl
@@ -1422,16 +4159,12 @@ AC_CHECK_HEADERS([\
 	arpa/nameser.h				\
 	config.h				\
 	crypt.h					\
-	dbm.h					\
-	db.h					\
 	dirent.h				\
 	errno.h					\
 	err.h					\
 	fcntl.h					\
-	gdbm/ndbm.h				\
 	grp.h					\
 	ifaddrs.h				\
-	ndbm.h					\
 	net/if.h				\
 	netdb.h					\
 	netinet/in.h				\
@@ -1442,9 +4175,9 @@ AC_CHECK_HEADERS([\
 	paths.h					\
 	pwd.h					\
 	resolv.h				\
-	rpcsvc/dbm.h				\
 	rpcsvc/ypclnt.h				\
 	shadow.h				\
+	sys/bswap.h				\
 	sys/ioctl.h				\
 	sys/param.h				\
 	sys/proc.h				\
@@ -1466,7 +4199,6 @@ AC_CHECK_HEADERS([\
 	usersec.h				\
 	util.h					\
 	vis.h					\
-	winsock.h				\
 ])
 	
 AC_REQUIRE([CHECK_NETINET_IP_AND_TCP])
@@ -1536,8 +4268,14 @@ AC_CHECK_FUNCS([				\
 	asprintf				\
 	cgetent					\
 	getconfattr				\
+	getprogname				\
 	getrlimit				\
 	getspnam				\
+	initstate				\
+	issetugid				\
+	random					\
+	setprogname				\
+	setstate				\
 	strsvis					\
 	strunvis				\
 	strvis					\
@@ -1614,24 +4352,55 @@ AC_NEED_PROTO([
 vasnprintf)dnl
 fi
 
+AC_FIND_FUNC_NO_LIBS(bswap16,,
+[#ifdef HAVE_SYS_BSWAP_H
+#include <sys/bswap.h>
+#endif],0)
+
+AC_FIND_FUNC_NO_LIBS(bswap32,,
+[#ifdef HAVE_SYS_BSWAP_H
+#include <sys/bswap.h>
+#endif],0)
+
 AC_FIND_FUNC_NO_LIBS(pidfile,util,
 [#ifdef HAVE_UTIL_H
 #include <util.h>
 #endif],0)
 
+AC_FIND_IF_NOT_BROKEN(getaddrinfo,,
+[#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif],[0,0,0,0])
+
+AC_FIND_IF_NOT_BROKEN(getnameinfo,,
+[#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif],[0,0,0,0,0,0,0])
+
+AC_FIND_IF_NOT_BROKEN(freeaddrinfo,,
+[#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif],[0])
+
+AC_FIND_IF_NOT_BROKEN(gai_strerror,,
+[#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif],[0])
+
 AC_BROKEN([					\
 	chown					\
 	copyhostent				\
 	daemon					\
+	ecalloc					\
+	emalloc					\
+	erealloc				\
+	estrdup					\
 	err					\
 	errx					\
 	fchown					\
 	flock					\
 	fnmatch					\
-	freeaddrinfo				\
 	freehostent				\
-	gai_strerror				\
-	getaddrinfo				\
 	getcwd					\
 	getdtablesize				\
 	getegid					\
@@ -1641,7 +4410,6 @@ AC_BROKEN([					\
 	getifaddrs				\
 	getipnodebyaddr				\
 	getipnodebyname				\
-	getnameinfo				\
 	getopt					\
 	gettimeofday				\
 	getuid					\
@@ -1746,6 +4514,13 @@ if test "$ac_cv_func_getnameinfo" = "yes"; then
   fi
 fi
 
+if test "$ac_cv_func_getaddrinfo" = "yes"; then
+  rk_BROKEN_GETADDRINFO
+  if test "$ac_cv_func_getaddrinfo_numserv" = no; then
+    LIBOBJS="$LIBOBJS getaddrinfo.o"
+  fi
+fi
+
 AC_NEED_PROTO([#include <stdlib.h>], setenv)
 AC_NEED_PROTO([#include <stdlib.h>], unsetenv)
 AC_NEED_PROTO([#include <unistd.h>], gethostname)
@@ -1957,6 +4732,7 @@ AC_SUBST(DIR_roken)dnl
 AC_SUBST(LIB_roken)dnl
 AC_SUBST(INCLUDES_roken)dnl
 ])
+
 dnl $KTH: check-type-extra.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
 dnl
 dnl ac_check_type + extra headers
@@ -2066,7 +4842,7 @@ fi
 
 # Define a conditional.
 
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)
 if $2; then
@@ -2077,7 +4853,7 @@ else
   $1_FALSE=
 fi])
 
-dnl $KTH: krb-ipv6.m4,v 1.9 2000/12/26 20:27:30 assar Exp $
+dnl $KTH: krb-ipv6.m4,v 1.12 2001/08/19 16:27:02 joda Exp $
 dnl
 dnl test for IPv6
 dnl
@@ -2087,6 +4863,7 @@ AC_ARG_WITH(ipv6,
 if test "$withval" = "no"; then
 	ac_cv_lib_ipv6=no
 fi])
+save_CFLAGS="${CFLAGS}"
 AC_CACHE_VAL(ac_cv_lib_ipv6,
 [dnl check for different v6 implementations (by itojun)
 v6type=unknown
@@ -2197,9 +4974,34 @@ AC_MSG_CHECKING(for IPv6)
 AC_MSG_RESULT($ac_cv_lib_ipv6)
 if test "$ac_cv_lib_ipv6" = yes; then
   AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.])
+else
+  CFLAGS="${save_CFLAGS}"
 fi
-])
 
+if test "$ac_cv_lib_ipv6" = yes; then
+	AC_CACHE_CHECK([for in6addr_loopback],[ac_cv_var_in6addr_loopback],[
+	AC_TRY_LINK([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif],[
+struct sockaddr_in6 sin6;
+sin6.sin6_addr = in6addr_loopback;
+],ac_cv_var_in6addr_loopback=yes,ac_cv_var_in6addr_loopback=no)])
+	if test "$ac_cv_var_in6addr_loopback" = yes; then
+		AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, 
+			[Define if you have the in6addr_loopback variable])
+	fi
+fi
+])
 dnl $KTH: find-func.m4,v 1.1 1997/12/14 15:58:58 joda Exp $
 dnl
 dnl AC_FIND_FUNC(func, libraries, includes, arguments)
@@ -2210,7 +5012,7 @@ if test -n "$LIB_$1"; then
 fi
 ])
 
-dnl $KTH: broken-snprintf.m4,v 1.3 1999/03/01 09:52:22 joda Exp $
+dnl $KTH: broken-snprintf.m4,v 1.4 2001/09/01 11:56:05 assar Exp $
 dnl
 AC_DEFUN(AC_BROKEN_SNPRINTF, [
 AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
@@ -2220,9 +5022,7 @@ AC_TRY_RUN([
 #include <string.h>
 int main()
 {
-changequote(`,')dnl
-	char foo[3];
-changequote([,])dnl
+	char foo[[3]];
 	snprintf(foo, 2, "12");
 	return strcmp(foo, "1");
 }],:,ac_cv_func_snprintf_working=no,:))
@@ -2245,9 +5045,7 @@ AC_TRY_RUN([
 
 int foo(int num, ...)
 {
-changequote(`,')dnl
-	char bar[3];
-changequote([,])dnl
+	char bar[[3]];
 	va_list arg;
 	va_start(arg, num);
 	vsnprintf(bar, 2, "%s", arg);
@@ -2295,7 +5093,7 @@ undefine([foo])
 fi
 ])
 
-dnl $KTH: broken-glob.m4,v 1.2 1999/03/01 09:52:15 joda Exp $
+dnl $KTH: broken-glob.m4,v 1.4 2001/06/19 09:59:46 assar Exp $
 dnl
 dnl check for glob(3)
 dnl
@@ -2305,12 +5103,19 @@ ac_cv_func_glob_working=yes
 AC_TRY_LINK([
 #include <stdio.h>
 #include <glob.h>],[
-glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE, NULL, NULL);
+glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
+#ifdef GLOB_MAXPATH
+GLOB_MAXPATH
+#else
+GLOB_LIMIT
+#endif
+,
+NULL, NULL);
 ],:,ac_cv_func_glob_working=no,:))
 
 if test "$ac_cv_func_glob_working" = yes; then
 	AC_DEFINE(HAVE_GLOB, 1, [define if you have a glob() that groks 
-	GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, and GLOB_TILDE])
+	GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT])
 fi
 if test "$ac_cv_func_glob_working" = yes; then
 AC_NEED_PROTO([#include <stdio.h>
@@ -2459,6 +5264,31 @@ main(int argc, char **argv)
 }
 ]], ac_cv_func_getnameinfo_broken=no, ac_cv_func_getnameinfo_broken=yes))])
 
+dnl $KTH: broken-getaddrinfo.m4,v 1.2 2001/08/22 01:05:29 assar Exp $
+dnl
+dnl test if getaddrinfo can handle numeric services
+
+AC_DEFUN(rk_BROKEN_GETADDRINFO,[
+AC_CACHE_CHECK([if getaddrinfo handles numeric services], ac_cv_func_getaddrinfo_numserv,
+AC_TRY_RUN([[#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int
+main(int argc, char **argv)
+{
+	struct addrinfo hints, *ai;
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_flags = AI_PASSIVE;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_family = PF_UNSPEC;
+	if(getaddrinfo(NULL, "17", &hints, &ai) == EAI_SERVICE)
+		return 1;
+	return 0;
+}
+]], ac_cv_func_getaddrinfo_numserv=yes, ac_cv_func_getaddrinfo_numserv=no))])
+
 dnl
 dnl $KTH: broken-realloc.m4,v 1.1 2000/07/15 18:05:36 joda Exp $
 dnl
@@ -2486,49 +5316,6 @@ AH_BOTTOM([#ifdef BROKEN_REALLOC
 #endif])
 ])
 
-dnl $KTH: krb-func-getcwd-broken.m4,v 1.2 1999/03/01 13:03:32 joda Exp $
-dnl
-dnl
-dnl test for broken getcwd in (SunOS braindamage)
-dnl
-
-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
-if test "$ac_cv_func_getcwd" = yes; then
-AC_MSG_CHECKING(if getcwd is broken)
-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
-ac_cv_func_getcwd_broken=no
-
-AC_TRY_RUN([
-#include <errno.h>
-char *getcwd(char*, int);
-
-void *popen(char *cmd, char *mode)
-{
-	errno = ENOTTY;
-	return 0;
-}
-
-int main()
-{
-	char *ret;
-	ret = getcwd(0, 1024);
-	if(ret == 0 && errno == ENOTTY)
-		return 0;
-	return 1;
-}
-], ac_cv_func_getcwd_broken=yes,:,:)
-])
-if test "$ac_cv_func_getcwd_broken" = yes; then
-	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
-	LIBOBJS="$LIBOBJS getcwd.o"
-	AC_SUBST(LIBOBJS)dnl
-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
-else
-	AC_MSG_RESULT([seems ok])
-fi
-fi
-])
-
 dnl $KTH: proto-compat.m4,v 1.3 1999/03/01 13:03:48 joda Exp $
 dnl
 dnl
@@ -2551,7 +5338,7 @@ if test "$ac_cv_func_$2_proto_compat" = yes; then
 fi
 undefine([foo])
 ])
-dnl $KTH: check-var.m4,v 1.5 2000/12/15 04:54:06 assar Exp $
+dnl $KTH: check-var.m4,v 1.6 2001/08/21 12:00:16 joda Exp $
 dnl
 dnl rk_CHECK_VAR(variable, includes)
 AC_DEFUN([rk_CHECK_VAR], [
@@ -2565,7 +5352,7 @@ int foo() { return $1; }],
 ac_foo=`eval echo \\$ac_cv_var_$1`
 AC_MSG_RESULT($ac_foo)
 if test "$ac_foo" = yes; then
-	AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_[]$1), 1, 
+	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
 		[Define if you have the `]$1[' variable.])
 	m4_ifval([$2], AC_CHECK_DECLARATION([$2],[$1]))
 fi
@@ -2599,7 +5386,7 @@ fi
 undefine([foo])
 ])
 
-dnl $KTH: krb-struct-winsize.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+dnl $KTH: krb-struct-winsize.m4,v 1.3 2001/09/01 11:56:05 assar Exp $
 dnl
 dnl
 dnl Search for struct winsize
@@ -2611,9 +5398,7 @@ AC_CACHE_VAL(ac_cv_struct_winsize, [
 ac_cv_struct_winsize=no
 for i in sys/termios.h sys/ioctl.h; do
 AC_EGREP_HEADER(
-changequote(, )dnl
-struct[ 	]*winsize,dnl
-changequote([,])dnl
+struct[[ 	]]*winsize,dnl
 $i, ac_cv_struct_winsize=yes; break)dnl
 done
 ])
@@ -3113,6 +5898,168 @@ for i in $1; do
 done
 ])
 
+dnl $KTH: crypto.m4,v 1.7 2001/08/29 17:02:48 assar Exp $
+dnl
+dnl test for crypto libraries:
+dnl - libcrypto (from openssl)
+dnl - libdes (from krb4)
+dnl - own-built libdes
+
+AC_DEFUN([KRB_CRYPTO],[
+crypto_lib=unknown
+AC_WITH_ALL([openssl])
+
+DIR_des=
+
+AC_MSG_CHECKING([for crypto library])
+
+if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
+
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  INCLUDE_des=
+  LIB_des=
+  if test "$with_openssl_include" != ""; then
+    INCLUDE_des="-I${with_openssl}/include"
+  fi
+  if test "$with_openssl_lib" != ""; then
+    LIB_des="-L${with_openssl}/lib"
+  fi
+  CPPFLAGS="${INCLUDE_des} ${CPPFLAGS}"
+  LIB_des="${LIB_des} -lcrypto"
+  LIB_des_a="$LIB_des"
+  LIB_des_so="$LIB_des"
+  LIB_des_appl="$LIB_des"
+  LIBS="${LIBS} ${LIB_des}"
+  AC_TRY_LINK([
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+  #include <openssl/sha.h>
+  #include <des.h>
+  #include <openssl/rc4.h>
+  ],
+  [
+    MD4_CTX md4;
+    MD5_CTX md5;
+    SHA_CTX sha1;
+
+    MD4_Init(&md4);
+    MD5_Init(&md5);
+    SHA1_Init(&sha1);
+
+    des_cbc_encrypt(0, 0, 0, 0, 0, 0);
+    RC4(0, 0, 0, 0);
+  ], [
+  crypto_lib=libcrypto
+  AC_DEFINE([HAVE_OPENSSL], 1, [define to use openssl's libcrypto])
+  AC_MSG_RESULT([libcrypto])])
+  CPPFLAGS="$save_CPPFLAGS"
+  LIBS="$save_LIBS"
+fi
+
+if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
+
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  INCLUDE_des="${INCLUDE_krb4}"
+  LIB_des=
+  if test "$krb4_libdir"; then
+    LIB_des="-L${krb4_libdir}"
+  fi
+  LIB_des="${LIB_des} -ldes"
+  CPPFLAGS="${CPPFLAGS} ${INCLUDE_des}"
+  LIBS="${LIBS} ${LIB_des}"
+  LIB_des_a="$LIB_des"
+  LIB_des_so="$LIB_des"
+  LIB_des_appl="$LIB_des"
+  LIBS="${LIBS} ${LIB_des}"
+  AC_TRY_LINK([
+  #undef KRB5 /* makes md4.h et al unhappy */
+  #define KRB4
+  #include <md4.h>
+  #include <md5.h>
+  #include <sha.h>
+  #include <des.h>
+  #include <rc4.h>
+  ],
+  [
+    MD4_CTX md4;
+    MD5_CTX md5;
+    SHA_CTX sha1;
+
+    MD4_Init(&md4);
+    MD5_Init(&md5);
+    SHA1_Init(&sha1);
+
+    des_cbc_encrypt(0, 0, 0, 0, 0, 0);
+    RC4(0, 0, 0, 0);
+  ], [crypto_lib=krb4; AC_MSG_RESULT([krb4's libdes])])
+  CPPFLAGS="$save_CPPFLAGS"
+  LIBS="$save_LIBS"
+fi
+
+if test "$crypto_lib" = "unknown"; then
+
+  DIR_des='des'
+  LIB_des='$(top_builddir)/lib/des/libdes.la'
+  LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
+  LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
+  LIB_des_appl="-ldes"
+
+  AC_MSG_RESULT([included libdes])
+
+fi
+
+AC_SUBST(DIR_des)
+AC_SUBST(INCLUDE_des)
+AC_SUBST(LIB_des)
+AC_SUBST(LIB_des_a)
+AC_SUBST(LIB_des_so)
+AC_SUBST(LIB_des_appl)
+])
+
+dnl
+dnl $KTH: with-all.m4,v 1.1 2001/08/29 17:01:23 assar Exp $
+dnl
+
+dnl AC_WITH_ALL(name)
+
+AC_DEFUN([AC_WITH_ALL], [
+AC_ARG_WITH($1,
+	AC_HELP_STRING([--with-$1=dir],
+		[use $1 in dir]))
+
+AC_ARG_WITH($1-lib,
+	AC_HELP_STRING([--with-$1-lib=dir],
+		[use $1 libraries in dir]),
+[if test "$withval" = "yes" -o "$withval" = "no"; then
+  AC_MSG_ERROR([No argument for --with-$1-lib])
+elif test "X$with_$1" = "X"; then
+  with_$1=yes
+fi])
+
+AC_ARG_WITH($1-include,
+	AC_HELP_STRING([--with-$1-include=dir],
+		[use $1 headers in dir]),
+[if test "$withval" = "yes" -o "$withval" = "no"; then
+  AC_MSG_ERROR([No argument for --with-$1-include])
+elif test "X$with_$1" = "X"; then
+  with_$1=yes
+fi])
+
+case "$with_$1" in
+yes)	;;
+no)	;;
+"")	;;
+*)	if test "$with_$1_include" = ""; then
+		with_$1_include="$with_$1/include"
+	fi
+	if test "$with_$1_lib" = ""; then
+		with_$1_lib="$with_$1/lib$abilibdirext"
+	fi
+	;;
+esac
+])
 dnl $KTH: krb-readline.m4,v 1.2 2000/11/15 00:47:08 assar Exp $
 dnl
 dnl Tests for readline functions
@@ -3156,7 +6103,85 @@ AC_DEFINE(HAVE_READLINE, 1,
 	[Define if you have a readline compatible library.])dnl
 
 ])
-dnl $KTH: auth-modules.m4,v 1.1 1999/03/21 13:48:00 joda Exp $
+dnl $KTH: check-compile-et.m4,v 1.6 2001/09/02 17:08:48 assar Exp $
+dnl
+dnl CHECK_COMPILE_ET
+AC_DEFUN([CHECK_COMPILE_ET], [
+
+AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
+
+krb_cv_compile_et="no"
+if test "${COMPILE_ET}" = "compile_et"; then
+
+dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
+AC_MSG_CHECKING(whether compile_et has the features we need)
+cat > conftest_et.et <<'EOF'
+error_table conf
+prefix CONFTEST
+index 1
+error_code CODE1, "CODE1"
+index 128
+error_code CODE2, "CODE2"
+end
+EOF
+if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
+  dnl XXX Some systems have <et/com_err.h>.
+  save_CPPFLAGS="${save_CPPFLAGS}"
+  if test -d "/usr/include/et"; then
+    CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
+  fi
+  dnl Check that the `prefix' and `index' directives were honored.
+  AC_TRY_RUN([
+#include <com_err.h>
+#include <string.h>
+#include "conftest_et.h"
+int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
+  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
+fi
+AC_MSG_RESULT(${krb_cv_compile_et})
+rm -fr conftest*
+fi
+
+if test "${krb_cv_compile_et}" = "yes"; then
+  dnl Since compile_et seems to work, let's check libcom_err
+  krb_cv_save_LIBS="${LIBS}"
+  LIBS="${LIBS} -lcom_err"
+  AC_MSG_CHECKING(for com_err)
+  AC_TRY_LINK([#include <com_err.h>],[
+    const char *p;
+    p = error_message(0);
+  ],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
+  AC_MSG_RESULT(${krb_cv_com_err})
+  LIBS="${krb_cv_save_LIBS}"
+else
+  dnl Since compile_et doesn't work, forget about libcom_err
+  krb_cv_com_err="no"
+fi
+
+dnl Only use the system's com_err if we found compile_et, libcom_err, and
+dnl com_err.h.
+if test "${krb_cv_com_err}" = "yes"; then
+    DIR_com_err=""
+    LIB_com_err="-lcom_err"
+    LIB_com_err_a=""
+    LIB_com_err_so=""
+    AC_MSG_NOTICE(Using the already-installed com_err)
+else
+    COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et"
+    DIR_com_err="com_err"
+    LIB_com_err="\$(top_builddir)/lib/com_err/libcom_err.la"
+    LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
+    LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
+    AC_MSG_NOTICE(Using our own com_err)
+fi
+AC_SUBST(DIR_com_err)
+AC_SUBST(LIB_com_err)
+AC_SUBST(LIB_com_err_a)
+AC_SUBST(LIB_com_err_so)
+
+])
+
+dnl $KTH: auth-modules.m4,v 1.2 2001/09/01 11:56:05 assar Exp $
 dnl
 dnl Figure what authentication modules should be built
 
@@ -3174,9 +6199,7 @@ if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_shared" = yes;
 fi
 
 case "${host}" in
-changequote(,)dnl
-*-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
-changequote([,])dnl
+*-*-irix[[56]]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
 esac
 
 AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
diff --git a/kerberosV/src/admin/ktutil_locl.h b/kerberosV/src/admin/ktutil_locl.h
index 5d9b1fe0a39..d9456895229 100644
--- a/kerberosV/src/admin/ktutil_locl.h
+++ b/kerberosV/src/admin/ktutil_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -32,7 +32,7 @@
  */
 
 /* 
- * $KTH: ktutil_locl.h,v 1.12 2000/07/19 13:58:19 assar Exp $
+ * $KTH: ktutil_locl.h,v 1.17 2001/08/22 20:30:18 assar Exp $
  */
 
 #ifndef __KTUTIL_LOCL_H__
@@ -54,7 +54,11 @@
 #include <parse_time.h>
 #include <roken.h>
 
+#ifdef HAVE_OPENSSL
 #include <des.h>
+#else
+#include <des.h>
+#endif
 
 #include <krb5.h>
 #include <kadm5/admin.h>
@@ -64,11 +68,12 @@
 #include <getarg.h>
 
 extern krb5_context context;
-extern krb5_keytab keytab;
 
 extern int verbose_flag;
 extern char *keytab_string; 
 
+krb5_keytab ktutil_open_keytab(void);
+
 int kt_add (int argc, char **argv);
 int kt_change (int argc, char **argv);
 int kt_copy (int argc, char **argv);
@@ -76,6 +81,7 @@ int kt_get (int argc, char **argv);
 int kt_list(int argc, char **argv);
 int kt_purge(int argc, char **argv);
 int kt_remove(int argc, char **argv);
+int kt_rename(int argc, char **argv);
 int srvconv(int argc, char **argv);
 int srvcreate(int argc, char **argv);
 
diff --git a/kerberosV/src/appl/ftp/ftp/ftp_locl.h b/kerberosV/src/appl/ftp/ftp/ftp_locl.h
index ed09ffb2563..b22cdd3b9f4 100644
--- a/kerberosV/src/appl/ftp/ftp/ftp_locl.h
+++ b/kerberosV/src/appl/ftp/ftp/ftp_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $KTH: ftp_locl.h,v 1.34 1999/12/02 16:58:29 joda Exp $ */
+/* $KTH: ftp_locl.h,v 1.36 2001/08/22 20:30:19 assar Exp $ */
 
 #ifndef __FTP_LOCL_H__
 #define __FTP_LOCL_H__
@@ -129,7 +129,13 @@ struct hostent  *gethostbyname(const char *);
 
 #include "roken.h"
 #include "security.h"
-#include <des.h> /* for des_read_pw_string */
+
+/* des_read_pw_string */
+#ifdef HAVE_OPENSSL
+#include <des.h>
+#else
+#include <des.h>
+#endif
 
 #if defined(__sun__) && !defined(__svr4)
 int fclose(FILE*);
diff --git a/kerberosV/src/appl/otp/otp_locl.h b/kerberosV/src/appl/otp/otp_locl.h
index fda84d79ff9..f9e67e63467 100644
--- a/kerberosV/src/appl/otp/otp_locl.h
+++ b/kerberosV/src/appl/otp/otp_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $KTH: otp_locl.h,v 1.7 1999/12/02 16:58:32 joda Exp $ */
+/* $KTH: otp_locl.h,v 1.9 2001/08/22 20:30:21 assar Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -52,5 +52,9 @@
 #endif
 #include <roken.h>
 #include <err.h>
+#ifdef HAVE_OPENSSL
 #include <des.h>
+#else
+#include <des.h>
+#endif
 #include <otp.h>
diff --git a/kerberosV/src/appl/su/su.c b/kerberosV/src/appl/su/su.c
index a4d32638b12..a176c43b2ea 100644
--- a/kerberosV/src/appl/su/su.c
+++ b/kerberosV/src/appl/su/su.c
@@ -32,7 +32,7 @@
 
 #include <config.h>
 
-RCSID("$KTH: su.c,v 1.18 2001/01/26 16:02:49 joda Exp $");
+RCSID("$KTH: su.c,v 1.22 2001/08/22 20:35:38 assar Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,7 +50,11 @@ RCSID("$KTH: su.c,v 1.18 2001/01/26 16:02:49 joda Exp $");
 
 #include <pwd.h>
 
+#ifdef HAVE_OPENSSL
 #include <des.h>
+#else
+#include <des.h>
+#endif
 #include <krb5.h>
 #include <kafs.h>
 #include <err.h>
@@ -103,10 +107,21 @@ usage (int ret)
     exit (ret);
 }
 
+static void
+free_info(struct passwd *p)
+{
+    free (p->pw_name);
+    free (p->pw_passwd);
+    free (p->pw_dir);
+    free (p->pw_shell);
+    free (p);
+}
+
 static struct passwd*
-make_info(struct passwd *pwd)
+dup_info(const struct passwd *pwd)
 {
     struct passwd *info;
+
     info = malloc(sizeof(*info));
     if(info == NULL)
 	return NULL;
@@ -117,8 +132,10 @@ make_info(struct passwd *pwd)
     info->pw_dir = strdup(pwd->pw_dir);
     info->pw_shell = strdup(pwd->pw_shell);
     if(info->pw_name == NULL || info->pw_passwd == NULL ||
-       info->pw_dir == NULL || info->pw_shell == NULL)
+       info->pw_dir == NULL || info->pw_shell == NULL) {
+	free_info (info);
 	return NULL;
+    }
     return info;
 }
 
@@ -128,7 +145,8 @@ static krb5_ccache ccache;
 #endif
 
 static int
-krb5_verify(struct passwd *login_info, struct passwd *su_info,
+krb5_verify(const struct passwd *login_info,
+	    const struct passwd *su_info,
 	    const char *kerberos_instance)
 {
 #ifdef KRB5
@@ -274,7 +292,7 @@ main(int argc, char **argv)
     int ok = 0;
     int kerberos_error=1;
 
-    set_progname (argv[0]);
+    setprogname (argv[0]);
 
     if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
 	usage(1);
@@ -303,7 +321,9 @@ main(int argc, char **argv)
 	syslog (LOG_ALERT, "NIS attack, user %s has uid 0", su_user);
 	errx (1, "unknown login %s", su_user);
     }
-    su_info = make_info(pwd);
+    su_info = dup_info(pwd);
+    if (su_info == NULL)
+	errx (1, "malloc: out of memory");
     
 #if defined(HAVE_GETLOGIN) && !defined(POSIX_GETLOGIN)
     login_user = getlogin();
@@ -312,7 +332,9 @@ main(int argc, char **argv)
 	pwd = getpwuid(getuid());
     if(pwd == NULL)
 	errx(1, "who are you?");
-    login_info = make_info(pwd);
+    login_info = dup_info(pwd);
+    if (login_info == NULL)
+	errx (1, "malloc: out of memory");
     if(env_flag)
 	shell = login_info->pw_shell;
     else
diff --git a/kerberosV/src/appl/telnet/libtelnet/enc_des.c b/kerberosV/src/appl/telnet/libtelnet/enc_des.c
index 61d47d0699b..2a1e8613768 100644
--- a/kerberosV/src/appl/telnet/libtelnet/enc_des.c
+++ b/kerberosV/src/appl/telnet/libtelnet/enc_des.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-RCSID("$KTH: enc_des.c,v 1.16 1998/07/09 23:16:23 assar Exp $");
+RCSID("$KTH: enc_des.c,v 1.20 2001/08/29 00:45:19 assar Exp $");
 
 #if	defined(AUTHENTICATION) && defined(ENCRYPTION) && defined(DES_ENCRYPTION)
 #include <arpa/telnet.h>
@@ -50,7 +50,11 @@ RCSID("$KTH: enc_des.c,v 1.16 1998/07/09 23:16:23 assar Exp $");
 #include "encrypt.h"
 #include "misc-proto.h"
 
+#ifdef HAVE_OPENSSL
 #include <des.h>
+#else
+#include <des.h>
+#endif
 
 extern int encrypt_debug_mode;
 
@@ -124,6 +128,8 @@ int fb64_reply (unsigned char *, int, struct fb *);
 static void fb64_session (Session_Key *, int, struct fb *);
 void fb64_stream_key (des_cblock, struct stinfo *);
 int fb64_keyid (int, unsigned char *, int *, struct fb *);
+void fb64_printsub(unsigned char *, int ,
+		   unsigned char *, int , char *);
 
 void cfb64_init(int server)
 {
@@ -404,7 +410,7 @@ static void fb64_session(Session_Key *key, int server, struct fb *fbp)
 	fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]);
 
 	if (fbp->once == 0) {
-#ifndef OLD_DES_RANDOM_KEY
+#if !defined(OLD_DES_RANDOM_KEY) && !defined(HAVE_OPENSSL)
 		des_init_random_number_generator(&fbp->krbdes_key);
 #endif
 		fbp->once = 1;
diff --git a/kerberosV/src/appl/telnet/libtelnet/encrypt.h b/kerberosV/src/appl/telnet/libtelnet/encrypt.h
index b8f15a51711..59b299ea540 100644
--- a/kerberosV/src/appl/telnet/libtelnet/encrypt.h
+++ b/kerberosV/src/appl/telnet/libtelnet/encrypt.h
@@ -55,7 +55,7 @@
  * or implied warranty.
  */
 
-/* $KTH: encrypt.h,v 1.4 1997/01/24 23:10:56 assar Exp $ */
+/* $KTH: encrypt.h,v 1.7 2001/08/22 20:30:22 assar Exp $ */
 
 #ifndef	__ENCRYPT__
 #define	__ENCRYPT__
@@ -90,6 +90,13 @@ typedef struct {
 
 #define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
 
+#ifdef HAVE_OPENSSL
+#include <des.h>
+#define des_new_random_key des_random_key
+#else
+#include <des.h>
+#endif
+
 #include "enc-proto.h"
 
 extern int encrypt_debug_mode;
diff --git a/kerberosV/src/cf/crypto.m4 b/kerberosV/src/cf/crypto.m4
index a2a3670d211..029d2f77fc5 100644
--- a/kerberosV/src/cf/crypto.m4
+++ b/kerberosV/src/cf/crypto.m4
@@ -35,7 +35,7 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
   #include <openssl/md4.h>
   #include <openssl/md5.h>
   #include <openssl/sha.h>
-  #include <openssl/des.h>
+  #include <des.h>
   #include <openssl/rc4.h>
   ],
   [
diff --git a/kerberosV/src/configure b/kerberosV/src/configure
index 31b792ff750..21ee9f355f8 100644
--- a/kerberosV/src/configure
+++ b/kerberosV/src/configure
@@ -1,15 +1,183 @@
 #! /bin/sh
-# From configure.in Revision: 1.270 .
+# From configure.in Revision: 1.302 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.49d for heimdal 0.3e.
+# Generated by Autoconf 2.52 for heimdal 0.4e.
 #
 # Report bugs to <heimdal-bugs@pdc.kth.se>.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
+# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+fi
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  for dir in $PATH /usr/ucb; do
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "$0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+fi
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -18,47 +186,34 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-rm -f conftest conftest.exe conftest.file
-echo >conftest.file
-if ln -s conftest.file conftest 2>/dev/null; then
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
   # We could just check for DJGPP; but this test a) works b) is more generic
   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conftest.exe; then
+  if test -f conf$$.exe; then
     # Don't use ln at all; we don't have any links
     as_ln_s='cp -p'
   else
     as_ln_s='ln -s'
   fi
-elif ln conftest.file conftest 2>/dev/null; then
+elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conftest conftest.exe conftest.file
+rm -f conf$$ conf$$.exe conf$$.file
 
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conftest.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conftest.file
-if test -x conftest.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
-elif test -f conftest.file >/dev/null 2>&1; then
-  as_executable_p="test -f"
-else
-  { { echo "$as_me:57: error: cannot check whether a file is executable on this system" >&5
-echo "$as_me: error: cannot check whether a file is executable on this system" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f conftest.file
+as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
@@ -91,59 +246,6 @@ $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-# Name of the executable.
-as_me=`echo "$0" | sed 's,.*/,,'`
-
-cat >config.log <<EOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me (heimdal 0.3e) 2.49d, executed with
- > $0 $@
-
-EOF
-{
-cat <<_ASUNAME
-## ---------- ##
-## Platform.  ##
-## ---------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-PATH = $PATH
-
-_ASUNAME
-} >>config.log
-
-cat >>config.log <<EOF
-## ------------ ##
-## Core tests.  ##
-## ------------ ##
-
-EOF
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-exec 5>>config.log
 exec 6>&1
 
 #
@@ -160,22 +262,16 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # only ac_max_sed_lines should be used.
 : ${ac_max_here_lines=38}
 
-# Avoid depending upon Character Ranges.
-ac_cr_az='abcdefghijklmnopqrstuvwxyz'
-ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-ac_cr_09='0123456789'
-ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
-
-# Sed expression to map a string onto a valid sh and CPP variable names.
-ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
-ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
-
 ac_default_prefix=/usr/heimdal
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
@@ -189,13 +285,16 @@ ac_includes_default="\
 #  include <memory.h>
 # endif
 # include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -242,8 +341,8 @@ mandir='${prefix}/man'
 # Identity of this package.
 PACKAGE_NAME='heimdal'
 PACKAGE_TARNAME='heimdal'
-PACKAGE_VERSION='0.3e'
-PACKAGE_STRING='heimdal 0.3e'
+PACKAGE_VERSION='0.4e'
+PACKAGE_STRING='heimdal 0.4e'
 PACKAGE_BUGREPORT='heimdal-bugs@pdc.kth.se'
 
 ac_prev=
@@ -291,9 +390,8 @@ do
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:295: error: invalid feature name: $ac_feature" >&5
-echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
     eval "enable_$ac_feature=no" ;;
@@ -301,9 +399,8 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:305: error: invalid feature name: $ac_feature" >&5
-echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
     case $ac_option in
@@ -484,9 +581,8 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:488: error: invalid package name: $ac_package" >&5
-echo "$as_me: error: invalid package name: $ac_package" >&2;}
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
     case $ac_option in
@@ -498,9 +594,8 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:502: error: invalid package name: $ac_package" >&5
-echo "$as_me: error: invalid package name: $ac_package" >&2;}
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
     eval "with_$ac_package=no" ;;
@@ -523,19 +618,16 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;}
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { { echo "$as_me:526: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2;}
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
-      { { echo "$as_me:537: error: invalid variable name: $ac_envvar" >&5
-echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"
@@ -543,11 +635,9 @@ echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    { echo "$as_me:546: WARNING: you should use --build, --host, --target" >&5
-echo "$as_me: WARNING: you should use --build, --host, --target" >&2;}
-    expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
-      { echo "$as_me:549: WARNING: invalid host type: $ac_option" >&5
-echo "$as_me: WARNING: invalid host type: $ac_option" >&2;}
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -556,22 +646,29 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { { echo "$as_me:559: error: missing argument to $ac_option" >&5
-echo "$as_me: error: missing argument to $ac_option" >&2;}
+  { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
 # Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir \
-              exec_prefix prefix
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* ) ;;
-    NONE ) ;;
-    *)  { { echo "$as_me:573: error: expected an absolute path for --$ac_var: $ac_val" >&5
-echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -586,10 +683,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    { echo "$as_me:589: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&5
-echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2;}
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -605,7 +700,7 @@ if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then its parent.
   ac_prog=$0
-  ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
+  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
@@ -616,16 +711,14 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { { echo "$as_me:619: error: cannot find sources in $ac_confdir or .." >&5
-echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2;}
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
   else
-    { { echo "$as_me:623: error: cannot find sources in $srcdir" >&5
-echo "$as_me: error: cannot find sources in $srcdir" >&2;}
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
    { (exit 1); exit 1; }; }
   fi
 fi
-srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
 ac_env_build_alias_set=${build_alias+set}
 ac_env_build_alias_value=$build_alias
 ac_cv_env_build_alias_set=${build_alias+set}
@@ -650,14 +743,14 @@ ac_env_LDFLAGS_set=${LDFLAGS+set}
 ac_env_LDFLAGS_value=$LDFLAGS
 ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
 ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
 ac_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_env_CPPFLAGS_value=$CPPFLAGS
 ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
 ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
 
 #
 # Report the --help message.
@@ -666,7 +759,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<EOF
-\`configure' configures heimdal 0.3e to adapt to many kinds of systems.
+\`configure' configures heimdal 0.4e to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -736,7 +829,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of heimdal 0.3e:";;
+     short | recursive ) echo "Configuration of heimdal 0.4e:";;
    esac
   cat <<\EOF
 
@@ -750,8 +843,6 @@ Optional Features:
   --enable-fast-install=PKGS  optimize for fast installation default=yes
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-dce	if you want support for DCE/DFS PAG's.
-  --enable-kaserver	  if you want the KDC to try to emulate a kaserver
-  --enable-kaserver-db	  if you want support for reading kaserver databases in hprop
   --disable-otp          if you don't want OTP support
   --enable-osfc2          enable some OSF C2 support
   --enable-bigendian	the target is big endian
@@ -779,15 +870,19 @@ Optional Packages:
   --with-hesiod-lib=dir            use hesiod libraries in dir
   --with-hesiod-include=dir        use hesiod headers in dir
   --with-x                use the X Window System
+  --with-openssl=dir      use openssl in dir
+  --with-openssl-lib=dir  use openssl libraries in dir
+  --with-openssl-include=dir
+                          use openssl headers in dir
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPP         C preprocessor
   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
               headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -826,8 +921,7 @@ if test "$ac_init_help" = "recursive"; then
       echo
       $ac_configure --help
     else
-      { echo "$as_me:829: WARNING: no configuration information is in $ac_subdir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
     fi
     cd $ac_popdir
   done
@@ -836,15 +930,61 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\EOF
-configure (heimdal 0.3e) 2.49d
+heimdal configure 0.4e
+generated by GNU Autoconf 2.52
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 EOF
   exit 0
 fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by heimdal $as_me 0.4e, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+
+  $ $0 $@
+
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+PATH = $PATH
+
+_ASUNAME
+} >&5
+
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+
+EOF
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
@@ -885,11 +1025,11 @@ trap 'exit_status=$?
     *ac_space=\ *)
       sed -n \
         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } >&5
@@ -906,11 +1046,11 @@ trap 'exit_status=$?
   test "$ac_signal" != 0 &&
     echo "$as_me: caught signal $ac_signal" >&5
   echo "$as_me: exit $exit_status" >&5
-  rm -rf conftest* confdefs* core core.* *.core $ac_clean_files &&
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
@@ -930,7 +1070,9 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:1073: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    cat "$ac_site_file" >&5
     . "$ac_site_file"
   fi
 done
@@ -939,7 +1081,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:942: loading cache $cache_file" >&5
+    { echo "$as_me:1084: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -947,14 +1089,14 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:950: creating cache $cache_file" >&5
+  { echo "$as_me:1092: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
-ac_suggest_removing_cache=false
+ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
@@ -963,31 +1105,44 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:966: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:1108: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:970: WARNING: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
-      ac_suggest_removing_cache=: ;;
+      { echo "$as_me:1112: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:976: WARNING: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:978: WARNING:   former value:  $ac_old_val" >&5
-echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:980: WARNING:   current value: $ac_new_val" >&5
-echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
-        ac_suggest_removing_cache=:
+        { echo "$as_me:1118: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:1120:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:1122:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
       fi;;
   esac
+  # Pass precious variables to config.status.  It doesn't matter if
+  # we pass some twice (in addition to the command line arguments).
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+       ;;
+    esac
+  fi
 done
-if $ac_suggest_removing_cache; then
-  { echo "$as_me:987: WARNING: changes in the environment can compromise the build" >&5
-echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
-  { echo "$as_me:989: WARNING: consider removing $cache_file and starting over" >&5
-echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
+if $ac_cache_corrupted; then
+  { echo "$as_me:1141: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:1143: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -1002,10 +1157,24 @@ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
   *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
+echo "#! $SHELL" >conftest.sh
+echo  "exit 0"   >>conftest.sh
+chmod +x conftest.sh
+if { (echo "$as_me:1163: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:1166: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
+else
+  ac_path_separator=:
+fi
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
 
 ac_config_headers="$ac_config_headers include/config.h"
 
-ac_config_commands="$ac_config_commands default-1"
+  ac_config_commands="$ac_config_commands default-1"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1015,7 +1184,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1018: checking for $ac_word" >&5
+echo "$as_me:1187: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1023,13 +1192,14 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
+echo "$as_me:1202: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1037,10 +1207,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1040: result: $CC" >&5
+  echo "$as_me:1210: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1043: result: no" >&5
+  echo "$as_me:1213: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1049,7 +1219,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1052: checking for $ac_word" >&5
+echo "$as_me:1222: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1057,13 +1227,14 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:1237: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1071,10 +1242,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1074: result: $ac_ct_CC" >&5
+  echo "$as_me:1245: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1077: result: no" >&5
+  echo "$as_me:1248: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1087,7 +1258,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1090: checking for $ac_word" >&5
+echo "$as_me:1261: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1095,13 +1266,14 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
+echo "$as_me:1276: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1109,10 +1281,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1112: result: $CC" >&5
+  echo "$as_me:1284: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1115: result: no" >&5
+  echo "$as_me:1287: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1121,7 +1293,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1124: checking for $ac_word" >&5
+echo "$as_me:1296: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1129,13 +1301,14 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:1311: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1143,10 +1316,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1146: result: $ac_ct_CC" >&5
+  echo "$as_me:1319: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1149: result: no" >&5
+  echo "$as_me:1322: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1159,7 +1332,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1162: checking for $ac_word" >&5
+echo "$as_me:1335: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1168,7 +1341,7 @@ else
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
@@ -1179,6 +1352,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
+echo "$as_me:1355: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1200,10 +1374,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1203: result: $CC" >&5
+  echo "$as_me:1377: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1206: result: no" >&5
+  echo "$as_me:1380: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1214,7 +1388,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1217: checking for $ac_word" >&5
+echo "$as_me:1391: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1222,13 +1396,14 @@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+echo "$as_me:1406: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1236,10 +1411,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1239: result: $CC" >&5
+  echo "$as_me:1414: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1242: result: no" >&5
+  echo "$as_me:1417: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1252,7 +1427,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1255: checking for $ac_word" >&5
+echo "$as_me:1430: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1260,13 +1435,14 @@ else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
+echo "$as_me:1445: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1274,10 +1450,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1277: result: $ac_ct_CC" >&5
+  echo "$as_me:1453: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1280: result: no" >&5
+  echo "$as_me:1456: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1289,61 +1465,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1292: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1468: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1296: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1302 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1314: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+# Provide some information about the compiler.
+echo "$as_me:1473:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:1476: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1317: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:1329: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-   { (exit 1); exit 1; }; }
-fi
+  echo "$as_me:1479: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1481: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1484: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:1486: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:1489: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:1336: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:1340: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if test "${ac_cv_exeext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 1346 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 1493 "configure"
 #include "confdefs.h"
 
 int
@@ -1354,17 +1501,32 @@ main ()
   return 0;
 }
 _ACEOF
-# Try without -o first, disregard a.out.
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:1509: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1359: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1512: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1362: \$? = $ac_status" >&5
+  echo "$as_me:1515: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
+                ls a.out conftest 2>/dev/null;
+                ls a.* conftest.* 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.out | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    a.out ) # We found the default executable, but exeext='' is most
+            # certainly right.
+            break;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
           export ac_cv_exeext
           break;;
     * ) break;;
@@ -1373,16 +1535,59 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
+{ { echo "$as_me:1538: error: C compiler cannot create executables" >&5
+echo "$as_me: error: C compiler cannot create executables" >&2;}
+   { (exit 77); exit 77; }; }
 fi
 
+ac_exeext=$ac_cv_exeext
+echo "$as_me:1544: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1549: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:1555: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:1558: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:1565: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:1573: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
 rm -f a.out a.exe conftest$ac_cv_exeext
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:1580: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:1582: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
 
-# We have not set ac_exeext yet which is needed by `ac_link'.
-ac_exeext=$ac_cv_exeext
-if { (eval echo "$as_me:1382: \"$ac_link\"") >&5
+echo "$as_me:1585: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:1587: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1385: \$? = $ac_status" >&5
+  echo "$as_me:1590: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1398,22 +1603,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1401: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1606: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext
-
-fi
-echo "$as_me:1409: result: $ac_cv_exeext" >&5
+rm -f conftest$ac_cv_exeext
+echo "$as_me:1612: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
+
+rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1413: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line 1416 "configure"
+echo "$as_me:1618: checking for object suffix" >&5
+echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1624 "configure"
 #include "confdefs.h"
 
 int
@@ -1424,62 +1632,40 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:1428: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:1431: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:1433: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:1436: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # 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 { (eval echo "$as_me:1441: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:1636: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1444: \$? = $ac_status" >&5
+  echo "$as_me:1639: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-      cross_compiling=yes
-    else
-      { { echo "$as_me:1451: error: cannot run C compiled programs.
-To enable cross compilation, use \`--host'." >&5
-echo "$as_me: error: cannot run C compiled programs.
-To enable cross compilation, use \`--host'." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:1459: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:1464: result: no" >&5
-echo "${ECHO_T}no" >&6
-{ { echo "$as_me:1466: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
-   { (exit 77); exit 77; }; }
+{ { echo "$as_me:1651: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:1471: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1473: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1476: checking whether we are using the GNU C compiler" >&5
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:1658: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:1662: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1482 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 int
@@ -1494,16 +1680,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1500: \$? = $ac_status" >&5
+  echo "$as_me:1686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1502: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1689: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1505: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1692: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -1514,19 +1701,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1517: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1704: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1523: checking whether $CC accepts -g" >&5
+echo "$as_me:1710: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1529 "configure"
+#line 1716 "configure"
 #include "confdefs.h"
 
 int
@@ -1538,16 +1725,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1544: \$? = $ac_status" >&5
+  echo "$as_me:1731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1546: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1734: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1549: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1737: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -1556,7 +1744,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1559: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1747: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1583,16 +1771,17 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1586: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1589: \$? = $ac_status" >&5
+  echo "$as_me:1777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1591: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1780: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1594: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1783: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
    '#include <stdlib.h>' \
@@ -1603,7 +1792,7 @@ if { (eval echo "$as_me:1586: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1606 "configure"
+#line 1795 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1616,16 +1805,17 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1622: \$? = $ac_status" >&5
+  echo "$as_me:1811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1624: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1814: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1627: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1817: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
@@ -1634,7 +1824,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1637 "configure"
+#line 1827 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1646,16 +1836,17 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1652: \$? = $ac_status" >&5
+  echo "$as_me:1842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1654: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:1845: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1657: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1848: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   break
 else
   echo "$as_me: failed program was:" >&5
@@ -1663,9 +1854,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 done
-echo '#ifdef __cplusplus' >>confdefs.h
-echo $ac_declaration      >>confdefs.h
-echo '#endif'             >>confdefs.h
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
 
 else
   echo "$as_me: failed program was:" >&5
@@ -1683,7 +1877,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:1686: checking how to run the C preprocessor" >&5
+echo "$as_me:1880: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -1696,25 +1890,27 @@ else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
-      # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 1705 "configure"
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1901 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax error
+                     Syntax error
 _ACEOF
-if { (eval echo "$as_me:1710: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:1906: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1716: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1912: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -1724,22 +1920,30 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1731 "configure"
+#line 1935 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1735: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:1939: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1741: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:1945: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -1749,54 +1953,55 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
+  # Broken: success on invalid input.
+continue
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
 
-fi
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-      if test -z "$ac_cpp_err"; then
-        break
-      fi
+if $ac_preproc_ok; then
+  break
+fi
+
     done
     ac_cv_prog_CPP=$CPP
 
 fi
   CPP=$ac_cv_prog_CPP
 else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:1982: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
   # Use a header file that comes with gcc, so configuring glibc
-# with a fresh cross-compiler works.
-# On the NeXT, cc -E runs the code through the compiler's parser,
-# not just through cpp. "Syntax error" is here to catch this case.
-ac_c_preproc_warn_flag=maybe
-cat >conftest.$ac_ext <<_ACEOF
-#line 1787 "configure"
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 1992 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax error
+                     Syntax error
 _ACEOF
-if { (eval echo "$as_me:1792: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:1997: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1798: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2003: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -1806,22 +2011,30 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # Now check whether non-existent headers can be detected and how
-# Skip if ac_cpp_err is not empty - ac_cpp is broken
-if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 1813 "configure"
+#line 2026 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:1817: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:2030: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:1823: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2036: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -1831,42 +2044,35 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  # cannot detect missing includes at all
-ac_cpp_err=yes
+  # Broken: success on invalid input.
+continue
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  if test "x$ac_cpp_err" = xmaybe; then
-      ac_c_preproc_warn_flag=yes
-    else
-      ac_c_preproc_warn_flag=
-    fi
-    ac_cpp_err=
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 rm -f conftest.err conftest.$ac_ext
-fi
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
 
-fi
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:1856: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-if test -n "$ac_cpp_err"; then
-  { { echo "$as_me:1859: error: C preprocessor \"$CPP\" fails sanity check" >&5
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:2064: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (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
 
-echo "$as_me:1869: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2075: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1874,7 +2080,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 1877 "configure"
+#line 2083 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -1923,16 +2129,17 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1929: \$? = $ac_status" >&5
+  echo "$as_me:2135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:1931: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1934: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2141: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
 else
@@ -1948,10 +2155,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:1951: result: none needed" >&5
+    echo "$as_me:2158: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:1954: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2161: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -1973,7 +2180,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1976: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:2183: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1993,14 +2200,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1996: checking for a BSD compatible install" >&5
+echo "$as_me:2203: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    ac_save_IFS=$IFS; IFS=':'
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
   for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
     # Account for people who put trailing slashes in PATH elements.
     case $ac_dir/ in
     / | ./ | .// | /cC/* \
@@ -2011,7 +2219,7 @@ else
       # Don't use installbsd from OSF since it installs stuff as root
       # by default.
       for ac_prog in ginstall scoinst install; do
-        if test -f "$ac_dir/$ac_prog"; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
 	  if test $ac_prog = install &&
             grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2029,7 +2237,6 @@ else
       ;;
     esac
   done
-  IFS=$ac_save_IFS
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2042,7 +2249,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2045: result: $INSTALL" >&5
+echo "$as_me:2252: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2053,7 +2260,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2056: checking whether build environment is sane" >&5
+echo "$as_me:2263: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -2076,7 +2283,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:2079: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:2286: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -2089,42 +2296,37 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:2092: error: newly created file is older than distributed files!
+   { { echo "$as_me:2299: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest*
-echo "$as_me:2099: result: yes" >&5
+echo "$as_me:2306: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF >conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF
-  program_transform_name=`echo $program_transform_name | sed -f conftestsed`
-  rm -f conftestsed
-fi
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},;$program_transform_name"
+  program_transform_name="s,^,$program_prefix,;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
-
-# sed with no file args requires a program.
-test -z "$program_transform_name" && program_transform_name="s,x,x,"
+  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $.  echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
 
 test x"${MISSING+set}" = xset || \
-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+# Use eval to expand $SHELL
 if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
   am_backtick='`'
-  { echo "$as_me:2127: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+  { echo "$as_me:2329: WARNING: ${am_backtick}missing' script is too old or missing" >&5
 echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
 fi
 
@@ -2132,7 +2334,7 @@ for ac_prog in mawk gawk 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
-echo "$as_me:2135: checking for $ac_word" >&5
+echo "$as_me:2337: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2140,13 +2342,14 @@ else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:2352: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2154,41 +2357,41 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2157: result: $AWK" >&5
+  echo "$as_me:2360: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2160: result: no" >&5
+  echo "$as_me:2363: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:2167: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2370: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftestmake <<\EOF
+  cat >conftest.make <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2187: result: yes" >&5
+  echo "$as_me:2390: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2191: result: no" >&5
+  echo "$as_me:2394: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2217,6 +2420,9 @@ fi
 
 if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
   DEPDIR=.deps
+  # We redirect because .deps might already exist and be populated.
+  # In this situation we don't want to see an error.
+  rmdir .deps > /dev/null 2>&1
 else
   DEPDIR=_deps
 fi
@@ -2224,16 +2430,16 @@ fi
 ac_config_commands="$ac_config_commands default-2"
 
 # test to see if srcdir already configured
-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:2229: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:2435: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 # Define the identity of the package.
 PACKAGE=heimdal
-VERSION=0.3e
+VERSION=0.4e
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -2264,9 +2470,12 @@ if test -z "$install_sh"; then
          install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
 fi
 
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+
 depcc="$CC"
 depcpp="$CPP"
-echo "$as_me:2269: checking dependency style of $depcc" >&5
+echo "$as_me:2478: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2290,10 +2499,13 @@ if test -z "$AMDEP"; then
       ;;
     none) break ;;
     esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
     if depmode="$depmode" \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
+       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1; then
       am_cv_CC_dependencies_compiler_type="$depmode"
       break
@@ -2307,17 +2519,17 @@ fi
 
 fi
 
-echo "$as_me:2310: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2522: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:2316: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:2528: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2320: checking build system type" >&5
+echo "$as_me:2532: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2326,23 +2538,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:2329: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:2541: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:2333: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:2545: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:2338: result: $ac_cv_build" >&5
+echo "$as_me:2550: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:2345: checking host system type" >&5
+echo "$as_me:2557: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2351,12 +2563,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:2354: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:2566: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:2359: result: $ac_cv_host" >&5
+echo "$as_me:2571: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2404,7 +2616,7 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2407: checking for $ac_word" >&5
+echo "$as_me:2619: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2412,13 +2624,14 @@ else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
+echo "$as_me:2634: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2426,10 +2639,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2429: result: $YACC" >&5
+  echo "$as_me:2642: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2432: result: no" >&5
+  echo "$as_me:2645: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2441,7 +2654,7 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2444: checking for $ac_word" >&5
+echo "$as_me:2657: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2449,13 +2662,14 @@ else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
+echo "$as_me:2672: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2463,10 +2677,10 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:2466: result: $LEX" >&5
+  echo "$as_me:2680: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:2469: result: no" >&5
+  echo "$as_me:2683: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2478,7 +2692,7 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2481: checking for $ac_word" >&5
+echo "$as_me:2695: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2486,13 +2700,14 @@ else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
+echo "$as_me:2710: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2500,10 +2715,10 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:2503: result: $LEX" >&5
+  echo "$as_me:2718: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:2506: result: no" >&5
+  echo "$as_me:2721: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2513,7 +2728,7 @@ test -n "$LEX" || LEX=":"
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:2516: checking for yywrap in -lfl" >&5
+  echo "$as_me:2731: checking for yywrap in -lfl" >&5
 echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
 if test "${ac_cv_lib_fl_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2521,7 +2736,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2524 "configure"
+#line 2739 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2540,31 +2755,32 @@ yywrap ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2546: \$? = $ac_status" >&5
+  echo "$as_me:2761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:2548: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:2764: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2551: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2767: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_fl_yywrap=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_fl_yywrap=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2562: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:2778: result: $ac_cv_lib_fl_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
 if test $ac_cv_lib_fl_yywrap = yes; then
   LEXLIB="-lfl"
 else
-  echo "$as_me:2567: checking for yywrap in -ll" >&5
+  echo "$as_me:2783: checking for yywrap in -ll" >&5
 echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
 if test "${ac_cv_lib_l_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2572,7 +2788,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2575 "configure"
+#line 2791 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2591,26 +2807,27 @@ yywrap ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2597: \$? = $ac_status" >&5
+  echo "$as_me:2813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:2599: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:2816: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2602: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2819: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_l_yywrap=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_l_yywrap=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2613: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:2830: result: $ac_cv_lib_l_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
 if test $ac_cv_lib_l_yywrap = yes; then
   LEXLIB="-ll"
@@ -2621,7 +2838,7 @@ fi
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:2624: checking lex output file root" >&5
+  echo "$as_me:2841: checking lex output file root" >&5
 echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_root+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2635,16 +2852,16 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:2638: error: cannot find output from $LEX; giving up" >&5
+  { { echo "$as_me:2855: error: cannot find output from $LEX; giving up" >&5
 echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-echo "$as_me:2643: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:2860: result: $ac_cv_prog_lex_root" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:2647: checking whether yytext is a pointer" >&5
+echo "$as_me:2864: checking whether yytext is a pointer" >&5
 echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2660,27 +2877,28 @@ cat >conftest.$ac_ext <<_ACEOF
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2666: \$? = $ac_status" >&5
+  echo "$as_me:2883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:2668: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:2886: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2671: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:2889: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:2683: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:2901: result: $ac_cv_prog_lex_yytext_pointer" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
@@ -2695,7 +2913,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2698: checking for $ac_word" >&5
+echo "$as_me:2916: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2703,13 +2921,14 @@ else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+echo "$as_me:2931: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2717,10 +2936,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2720: result: $RANLIB" >&5
+  echo "$as_me:2939: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2723: result: no" >&5
+  echo "$as_me:2942: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2729,7 +2948,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2732: checking for $ac_word" >&5
+echo "$as_me:2951: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2737,13 +2956,14 @@ else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:2966: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2752,10 +2972,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2755: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2975: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2758: result: no" >&5
+  echo "$as_me:2978: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2768,7 +2988,7 @@ for ac_prog in mawk gawk 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
-echo "$as_me:2771: checking for $ac_word" >&5
+echo "$as_me:2991: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2776,13 +2996,14 @@ else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:3006: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2790,17 +3011,17 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:2793: result: $AWK" >&5
+  echo "$as_me:3014: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:2796: result: no" >&5
+  echo "$as_me:3017: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:2803: checking for ln -s or something else" >&5
+echo "$as_me:3024: checking for ln -s or something else" >&5
 echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
 if test "${ac_cv_prog_LN_S+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2821,7 +3042,7 @@ else
 fi
 fi
 LN_S="$ac_cv_prog_LN_S"
-echo "$as_me:2824: result: $ac_cv_prog_LN_S" >&5
+echo "$as_me:3045: result: $ac_cv_prog_LN_S" >&5
 echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
 
 # Check whether --with-mips_abi or --without-mips_abi was given.
@@ -2849,13 +3070,13 @@ case "${with_mips_abi}" in
        n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
         64) abi='-mabi=64';  abilibdirext='64'   ;;
 	no) abi=''; abilibdirext='';;
-         *) { { echo "$as_me:2852: error: \"Invalid ABI specified\"" >&5
+         *) { { echo "$as_me:3073: error: \"Invalid ABI specified\"" >&5
 echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
    { (exit 1); exit 1; }; } ;;
 esac
 if test -n "$abi" ; then
 ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
-echo "$as_me:2858: checking if $CC supports the $abi option" >&5
+echo "$as_me:3079: checking if $CC supports the $abi option" >&5
 echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
 if eval "test \"\${$ac_foo+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2864,7 +3085,7 @@ else
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $abi"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2867 "configure"
+#line 3088 "configure"
 #include "confdefs.h"
 
 int
@@ -2876,16 +3097,17 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2879: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3100: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2882: \$? = $ac_status" >&5
+  echo "$as_me:3103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:2884: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3106: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2887: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:3109: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval $ac_foo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2898,7 +3120,7 @@ CFLAGS="$save_CFLAGS"
 fi
 
 ac_res=`eval echo \\\$$ac_foo`
-echo "$as_me:2901: result: $ac_res" >&5
+echo "$as_me:3123: result: $ac_res" >&5
 echo "${ECHO_T}$ac_res" >&6
 if test $ac_res = no; then
 # Try to figure out why that failed...
@@ -2907,7 +3129,7 @@ case $abi in
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -mabi=n32"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2910 "configure"
+#line 3132 "configure"
 #include "confdefs.h"
 
 int
@@ -2919,16 +3141,17 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3144: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2925: \$? = $ac_status" >&5
+  echo "$as_me:3147: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:2927: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3150: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2930: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:3153: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_res=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -2939,7 +3162,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	CLAGS="$save_CFLAGS"
 	if test $ac_res = yes; then
 		# New GCC
-		{ { echo "$as_me:2942: error: $CC does not support the $with_mips_abi ABI" >&5
+		{ { echo "$as_me:3165: error: $CC does not support the $with_mips_abi ABI" >&5
 echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -2954,7 +3177,7 @@ echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
 			abilibdirext=''
 		else
 			# Some broken GCC
-			{ { echo "$as_me:2957: error: $CC does not support the $with_mips_abi ABI" >&5
+			{ { echo "$as_me:3180: error: $CC does not support the $with_mips_abi ABI" >&5
 echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -2968,7 +3191,7 @@ case "${with_mips_abi}" in
        n32|yes) abi='-n32'; abilibdirext='32'  ;;
         64) abi='-64'; abilibdirext='64'   ;;
 	no) abi=''; abilibdirext='';;
-         *) { { echo "$as_me:2971: error: \"Invalid ABI specified\"" >&5
+         *) { { echo "$as_me:3194: error: \"Invalid ABI specified\"" >&5
 echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
    { (exit 1); exit 1; }; } ;;
 esac
@@ -2979,14 +3202,14 @@ esac
 CC="$CC $abi"
 libdir="$libdir$abilibdirext"
 
-echo "$as_me:2982: checking for __attribute__" >&5
+echo "$as_me:3205: checking for __attribute__" >&5
 echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
 if test "${ac_cv___attribute__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 2989 "configure"
+#line 3212 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -3008,16 +3231,17 @@ foo(void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3014: \$? = $ac_status" >&5
+  echo "$as_me:3237: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:3016: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3240: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3019: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:3243: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv___attribute__=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -3034,14 +3258,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:3037: result: $ac_cv___attribute__" >&5
+echo "$as_me:3261: result: $ac_cv___attribute__" >&5
 echo "${ECHO_T}$ac_cv___attribute__" >&6
 
 # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -3063,7 +3287,7 @@ fi;
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -3085,7 +3309,7 @@ fi;
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case "$enableval" in
+case $enableval in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -3112,9 +3336,9 @@ else
   with_gnu_ld=no
 fi;
 ac_prog=ld
-if test "$ac_cv_c_compiler_gnu" = yes; then
+if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:3117: checking for ld used by GCC" >&5
+  echo "$as_me:3341: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -3123,7 +3347,7 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   esac
-  case "$ac_prog" in
+  case $ac_prog in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -3144,13 +3368,13 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:3147: checking for GNU ld" >&5
+  echo "$as_me:3371: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:3150: checking for non-GNU ld" >&5
+  echo "$as_me:3374: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
-if test "${ac_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
@@ -3158,11 +3382,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
+      lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -3171,57 +3395,57 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$ac_cv_path_LD"
+LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:3180: result: $LD" >&5
+  echo "$as_me:3404: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3183: result: no" >&5
+  echo "$as_me:3407: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:3186: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:3410: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:3189: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:3413: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${ac_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
+  lt_cv_prog_gnu_ld=yes
 else
-  ac_cv_prog_gnu_ld=no
+  lt_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:3201: result: $ac_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
-with_gnu_ld=$ac_cv_prog_gnu_ld
+echo "$as_me:3425: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-echo "$as_me:3205: checking for $LD option to reload object files" >&5
+echo "$as_me:3429: checking for $LD option to reload object files" >&5
 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:3212: result: $lt_cv_ld_reload_flag" >&5
+echo "$as_me:3436: result: $lt_cv_ld_reload_flag" >&5
 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo "$as_me:3217: checking for BSD-compatible nm" >&5
+echo "$as_me:3441: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${ac_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  ac_cv_path_NM="$NM"
+  lt_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
@@ -3231,44 +3455,45 @@ else
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$tmp_nm -B"
+      # Tru64's nm complains that /dev/null is an invalid object file
+      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+	lt_cv_path_NM="$tmp_nm -B"
 	break
       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$tmp_nm -p"
+	lt_cv_path_NM="$tmp_nm -p"
 	break
       else
-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
+	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
 
-NM="$ac_cv_path_NM"
-echo "$as_me:3252: result: $NM" >&5
+NM="$lt_cv_path_NM"
+echo "$as_me:3477: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 
-echo "$as_me:3255: checking whether ln -s works" >&5
+echo "$as_me:3480: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:3259: result: yes" >&5
+  echo "$as_me:3484: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:3262: result: no, using $LN_S" >&5
+  echo "$as_me:3487: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:3266: checking how to recognise dependant libraries" >&5
+echo "$as_me:3491: checking how to recognise dependant libraries" >&5
 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_cv_file_magic_cmd='${MAGIC}'
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -3277,13 +3502,13 @@ lt_cv_deplibs_check_method='unknown'
 # `unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
+# ['file_magic [regex]'] -- check by looking for files in library path
 # which responds to the $file_magic_cmd with a given egrep regex.
 # If you have `file' or equivalent on your system and you're not sure
 # whether `pass_all' will *always* work, you probably want this one.
 
-case "$host_os" in
-aix4*)
+case $host_os in
+aix4* | aix5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3292,22 +3517,37 @@ beos*)
   ;;
 
 bsdi4*)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin* | mingw*)
+cygwin* | mingw* | pw32*)
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  case "$host_os" in
+  rhapsody* | darwin1.012)
+    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+    ;;
+  *) # Darwin 1.3 on
+    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    ;;
+  esac
   ;;
 
 freebsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case "$host_cpu" in
+    case $host_cpu in
     i*86 )
-            lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
-            lt_cv_file_magic_cmd=/usr/bin/file
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
@@ -3320,29 +3560,28 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-hpux10.20*)
-  # TODO:  Does this work for hpux-11 too?
-  lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+hpux10.20*|hpux11*)
+  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=/usr/lib/libc.sl
   ;;
 
 irix5* | irix6*)
-  case "$host_os" in
+  case $host_os in
   irix5*)
     # this will be overridden with pass_all, but let us keep it just in case
     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
     ;;
   *)
-    case "$LD" in
+    case $LD in
     *-32|*"-32 ") libmagic=32-bit;;
     *-n32|*"-n32 ") libmagic=N32;;
     *-64|*"-64 ") libmagic=64-bit;;
     *) libmagic=never-match;;
     esac
     # this will be overridden with pass_all, but let us keep it just in case
-        lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-        ;;
+    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+    ;;
   esac
   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=pass_all
@@ -3350,25 +3589,30 @@ irix5* | irix6*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  case "$host_cpu" in
+  case $host_cpu in
   alpha* | i*86 | powerpc* | sparc* | ia64* )
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-      esac
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+  esac
   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
   else
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-        lt_cv_file_magic_cmd='/usr/bin/file -L'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
   fi
   ;;
 
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
 osf3* | osf4* | osf5*)
   # this will be overridden with pass_all, but let us keep it just in case
   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -3385,54 +3629,303 @@ solaris*)
   lt_cv_file_magic_test_file=/lib/libc.so
   ;;
 
+sysv5uw[78]* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case "$host_vendor" in
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
     ;;
-  motorola)
-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
     ;;
   esac
   ;;
 esac
 
 fi
-echo "$as_me:3402: result: $lt_cv_deplibs_check_method" >&5
+echo "$as_me:3659: result: $lt_cv_deplibs_check_method" >&5
 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+echo "$as_me:3665: checking command to parse $NM output" >&5
+echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  ;;
+irix*)
+  symcode='[BCDEGRST]'
+  ;;
+solaris* | sysv5*)
+  symcode='[BDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $host_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  symcode='[ABCDGISTW]'
+fi
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if { (eval echo "$as_me:3742: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3745: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:3749: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  echo "$as_me:3752: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  save_LIBS="$LIBS"
+	  save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if { (eval echo "$as_me:3804: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3807: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$save_LIBS"
+	  CFLAGS="$save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  global_symbol_to_cdecl=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
+  echo "$as_me:3845: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+else
+  echo "$as_me:3848: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+fi
+
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:3855: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3861 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:3865: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3871: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:3890: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
 # Only perform the check for file, if the check method requires it
-case "$deplibs_check_method" in
+case $deplibs_check_method in
 file_magic*)
-  if test "$file_magic_cmd" = '${MAGIC}'; then
-    echo "$as_me:3411: checking for ${ac_tool_prefix}file" >&5
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    echo "$as_me:3904: checking for ${ac_tool_prefix}file" >&5
 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case "$MAGIC" in
+  case $MAGIC_CMD in
   /*)
-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
   ?:/*)
-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
   ;;
   *)
-  ac_save_MAGIC="$MAGIC"
+  ac_save_MAGIC_CMD="$MAGIC_CMD"
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="/usr/bin:$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC="$ac_dir/${ac_tool_prefix}file"
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
-	case "$deplibs_check_method" in
+	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC="$lt_cv_path_MAGIC"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    egrep "$file_magic_regex" > /dev/null; then
 	    :
@@ -3456,47 +3949,47 @@ EOF
     fi
   done
   IFS="$ac_save_ifs"
-  MAGIC="$ac_save_MAGIC"
+  MAGIC_CMD="$ac_save_MAGIC_CMD"
   ;;
 esac
 fi
 
-MAGIC="$lt_cv_path_MAGIC"
-if test -n "$MAGIC"; then
-  echo "$as_me:3466: result: $MAGIC" >&5
-echo "${ECHO_T}$MAGIC" >&6
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:3959: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3469: result: no" >&5
+  echo "$as_me:3962: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-if test -z "$lt_cv_path_MAGIC"; then
+if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:3475: checking for file" >&5
+    echo "$as_me:3968: checking for file" >&5
 echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case "$MAGIC" in
+  case $MAGIC_CMD in
   /*)
-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
   ?:/*)
-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
   ;;
   *)
-  ac_save_MAGIC="$MAGIC"
+  ac_save_MAGIC_CMD="$MAGIC_CMD"
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="/usr/bin:$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC="$ac_dir/file"
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
       if test -n "$file_magic_test_file"; then
-	case "$deplibs_check_method" in
+	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC="$lt_cv_path_MAGIC"
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    egrep "$file_magic_regex" > /dev/null; then
 	    :
@@ -3520,22 +4013,22 @@ EOF
     fi
   done
   IFS="$ac_save_ifs"
-  MAGIC="$ac_save_MAGIC"
+  MAGIC_CMD="$ac_save_MAGIC_CMD"
   ;;
 esac
 fi
 
-MAGIC="$lt_cv_path_MAGIC"
-if test -n "$MAGIC"; then
-  echo "$as_me:3530: result: $MAGIC" >&5
-echo "${ECHO_T}$MAGIC" >&6
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  echo "$as_me:4023: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3533: result: no" >&5
+  echo "$as_me:4026: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   else
-    MAGIC=:
+    MAGIC_CMD=:
   fi
 fi
 
@@ -3546,7 +4039,7 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3549: checking for $ac_word" >&5
+echo "$as_me:4042: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3554,13 +4047,14 @@ else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+echo "$as_me:4057: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3568,10 +4062,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3571: result: $RANLIB" >&5
+  echo "$as_me:4065: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3574: result: no" >&5
+  echo "$as_me:4068: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3580,7 +4074,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3583: checking for $ac_word" >&5
+echo "$as_me:4077: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3588,13 +4082,14 @@ else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:4092: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3603,10 +4098,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3606: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4101: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3609: result: no" >&5
+  echo "$as_me:4104: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3618,7 +4113,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:3621: checking for $ac_word" >&5
+echo "$as_me:4116: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3626,13 +4121,14 @@ else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+echo "$as_me:4131: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3640,10 +4136,10 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:3643: result: $STRIP" >&5
+  echo "$as_me:4139: result: $STRIP" >&5
 echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$as_me:3646: result: no" >&5
+  echo "$as_me:4142: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3652,7 +4148,7 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:3655: checking for $ac_word" >&5
+echo "$as_me:4151: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3660,13 +4156,14 @@ else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_STRIP="strip"
+echo "$as_me:4166: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3675,10 +4172,10 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:3678: result: $ac_ct_STRIP" >&5
+  echo "$as_me:4175: result: $ac_ct_STRIP" >&5
 echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$as_me:3681: result: no" >&5
+  echo "$as_me:4178: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3687,44 +4184,28 @@ else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$ac_cv_c_compiler_gnu" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+enable_dlopen=no
+enable_win32_dll=no
 
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval="$enable_libtool_lock"
 
 fi;
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi;
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3721 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:3722: \"$ac_compile\"") >&5
+  echo '#line 4202 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:4203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3725: \$? = $ac_status" >&5
+  echo "$as_me:4206: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -3743,7 +4224,7 @@ case "$host" in
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:3746: checking whether the C compiler needs -belf" >&5
+  echo "$as_me:4227: checking whether the C compiler needs -belf" >&5
 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3756,7 +4237,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat >conftest.$ac_ext <<_ACEOF
-#line 3759 "configure"
+#line 4240 "configure"
 #include "confdefs.h"
 
 int
@@ -3768,23 +4249,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3774: \$? = $ac_status" >&5
+  echo "$as_me:4255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:3776: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4258: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3779: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:4261: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 lt_cv_cc_needs_belf=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3792,7 +4274,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:3795: result: $lt_cv_cc_needs_belf" >&5
+echo "$as_me:4277: result: $lt_cv_cc_needs_belf" >&5
 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -3802,102 +4284,2807 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
 
 esac
 
-# Save cache, so that ltconfig can load it
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+need_locks="$enable_libtool_lock"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+if test x"$host" != x"$build"; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+case $host_os in
+linux-gnu*) ;;
+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+fi
+
+# Allow CC to be a program name with arguments.
+set dummy $CC
+compiler="$2"
+
+echo "$as_me:4370: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+echo "$as_me:4381: result: $objdir" >&5
+echo "${ECHO_T}$objdir" >&6
+
+# Check whether --with-pic or --without-pic was given.
+if test "${with_pic+set}" = set; then
+  withval="$with_pic"
+  pic_mode="$withval"
+else
+  pic_mode=default
+fi;
+test -z "$pic_mode" && pic_mode=default
+
+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+# in isolation, and that seeing it set (from the cache) indicates that
+# the associated values are set (in the cache) correctly too.
+echo "$as_me:4396: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_pic+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+   lt_cv_prog_cc_pic=
+  lt_cv_prog_cc_shlib=
+  lt_cv_prog_cc_wl=
+  lt_cv_prog_cc_static=
+  lt_cv_prog_cc_no_builtin=
+  lt_cv_prog_cc_can_build_shared=$can_build_shared
+
+  if test "$GCC" = yes; then
+    lt_cv_prog_cc_wl='-Wl,'
+    lt_cv_prog_cc_static='-static'
+
+    case $host_os in
+    aix*)
+      # Below there is a dirty hack to force normal static linking with -ldl
+      # The problem is because libdl dynamically linked with both libc and
+      # libC (AIX C++ library), which obviously doesn't included in libraries
+      # list by gcc. This cause undefined symbols with -static flags.
+      # This hack allows C programs to be linked with "-static -ldl", but
+      # we not sure about C++ programs.
+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_cv_prog_cc_pic='-fno-common'
+      ;;
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	 lt_cv_prog_cc_pic=-Kconform_pic
+      fi
+      ;;
+    *)
+      lt_cv_prog_cc_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for PIC flags for the system compiler.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+        # AIX 5 now supports IA64 processor
+        lt_cv_prog_cc_static='-Bstatic'
+        lt_cv_prog_cc_wl='-Wl,'
+      else
+        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+      lt_cv_prog_cc_pic='+Z'
+      ;;
+
+    irix5* | irix6*)
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      # PIC (with -KPIC) is the default.
+      ;;
+
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+
+    newsos6)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      # All OSF/1 code is PIC.
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_cv_prog_cc_pic='-Kpic'
+      lt_cv_prog_cc_static='-dn'
+      lt_cv_prog_cc_shlib='-belf'
+      ;;
+
+    solaris*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Wl,'
+      ;;
+
+    sunos4*)
+      lt_cv_prog_cc_pic='-PIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Qoption ld '
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      if test "x$host_vendor" = xsni; then
+        lt_cv_prog_cc_wl='-LD'
+      else
+        lt_cv_prog_cc_wl='-Wl,'
+      fi
+      ;;
+
+    uts4*)
+      lt_cv_prog_cc_pic='-pic'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_cv_prog_cc_pic='-Kconform_pic'
+	lt_cv_prog_cc_static='-Bstatic'
+      fi
+      ;;
+
+    *)
+      lt_cv_prog_cc_can_build_shared=no
+      ;;
+    esac
+  fi
 
+fi
+
+if test -z "$lt_cv_prog_cc_pic"; then
+  echo "$as_me:4543: result: none" >&5
+echo "${ECHO_T}none" >&6
+else
+  echo "$as_me:4546: result: $lt_cv_prog_cc_pic" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
+
+  # Check to make sure the pic_flag actually works.
+  echo "$as_me:4550: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
+  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 4558 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4570: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4573: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4576: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4579: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+        case $host_os in
+      hpux9* | hpux10* | hpux11*)
+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+	# they create non-PIC objects.  So, if there were any warnings, we
+	# assume that PIC is not supported.
+	if test -s conftest.err; then
+	  lt_cv_prog_cc_pic_works=no
+	else
+	  lt_cv_prog_cc_pic_works=yes
+	fi
+	;;
+      *)
+	lt_cv_prog_cc_pic_works=yes
+	;;
+      esac
 
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# 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.
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+      lt_cv_prog_cc_pic_works=no
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+    CFLAGS="$save_CFLAGS"
+
+fi
+
+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+    lt_cv_prog_cc_pic=
+    lt_cv_prog_cc_can_build_shared=no
+  else
+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+  fi
+
+  echo "$as_me:4615: result: $lt_cv_prog_cc_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
+fi
+
+# Check for any special shared library compilation flags.
+if test -n "$lt_cv_prog_cc_shlib"; then
+  { echo "$as_me:4621: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
+  else
+   { echo "$as_me:4625: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+    lt_cv_prog_cc_can_build_shared=no
+  fi
+fi
+
+echo "$as_me:4631: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
+if test "${lt_cv_prog_cc_static_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+    lt_cv_prog_cc_static_works=no
+  save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4640 "configure"
+#include "confdefs.h"
+
+int
+main ()
 {
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4652: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4655: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4658: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4661: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  lt_cv_prog_cc_static_works=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS="$save_LDFLAGS"
+
+fi
+
+# Belt *and* braces to stop my trousers falling down:
+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+echo "$as_me:4675: result: $lt_cv_prog_cc_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
+
+pic_flag="$lt_cv_prog_cc_pic"
+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+wl="$lt_cv_prog_cc_wl"
+link_static_flag="$lt_cv_prog_cc_static"
+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+can_build_shared="$lt_cv_prog_cc_can_build_shared"
+
+# Check to see if options -o and -c are simultaneously supported by compiler
+echo "$as_me:4686: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+if test "${lt_cv_compiler_c_o+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+$rm -r conftest 2>/dev/null
+mkdir conftest
+cd conftest
+echo "int some_variable = 0;" > conftest.$ac_ext
+mkdir out
+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+# that will create temporary files in the current directory regardless of
+# the output directory.  Thus, making CWD read-only will cause this test
+# to fail, enabling locking or at least warning the user not to do parallel
+# builds.
+chmod -w .
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+compiler_c_o=no
+if { (eval echo configure:4706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+  # The compiler can only warn and ignore the option if not recognized
+  # So say no if there are warnings
+  if test -s out/conftest.err; then
+    lt_cv_compiler_c_o=no
+  else
+    lt_cv_compiler_c_o=yes
+  fi
+else
+  # Append any errors to the config.log.
+  cat out/conftest.err 1>&5
+  lt_cv_compiler_c_o=no
+fi
+CFLAGS="$save_CFLAGS"
+chmod u+w .
+$rm conftest* out/*
+rmdir out
+cd ..
+rmdir conftest
+$rm -r conftest 2>/dev/null
+
+fi
+
+compiler_c_o=$lt_cv_compiler_c_o
+echo "$as_me:4730: result: $compiler_c_o" >&5
+echo "${ECHO_T}$compiler_c_o" >&6
+
+if test x"$compiler_c_o" = x"yes"; then
+  # Check to see if we can write to a .lo
+  echo "$as_me:4735: checking if $compiler supports -c -o file.lo" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
+  if test "${lt_cv_compiler_o_lo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+  lt_cv_compiler_o_lo=no
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -c -o conftest.lo"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4745 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+int some_variable = 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4757: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4760: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4763: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4766: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      lt_cv_compiler_o_lo=no
+    else
+      lt_cv_compiler_o_lo=yes
+    fi
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$save_CFLAGS"
+
+fi
+
+  compiler_o_lo=$lt_cv_compiler_o_lo
+  echo "$as_me:4786: result: $compiler_c_lo" >&5
+echo "${ECHO_T}$compiler_c_lo" >&6
+else
+  compiler_o_lo=no
+fi
+
+# Check to see if we can do hard links to lock some files if needed
+hard_links="nottested"
+if test "$compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo "$as_me:4796: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$as_me:4804: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6
+  if test "$hard_links" = no; then
+    { echo "$as_me:4807: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+if test "$GCC" = yes; then
+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+  echo "$as_me:4817: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+  compiler_rtti_exceptions=no
+  cat >conftest.$ac_ext <<_ACEOF
+#line 4824 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+int some_variable = 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4836: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4839: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4842: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4845: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      compiler_rtti_exceptions=no
+    else
+      compiler_rtti_exceptions=yes
+    fi
+
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$save_CFLAGS"
+  echo "$as_me:4861: result: $compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$compiler_rtti_exceptions" >&6
+
+  if test "$compiler_rtti_exceptions" = "yes"; then
+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+  else
+    no_builtin_flag=' -fno-builtin'
+  fi
+fi
+
+# See if the linker supports building shared libraries.
+echo "$as_me:4872: checking whether the linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
+
+allow_undefined_flag=
+no_undefined_flag=
+need_lib_prefix=unknown
+need_version=unknown
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+archive_cmds=
+archive_expsym_cmds=
+old_archive_from_new_cmds=
+old_archive_from_expsyms_cmds=
+export_dynamic_flag_spec=
+whole_archive_flag_spec=
+thread_safe_flag_spec=
+hardcode_into_libs=no
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+hardcode_shlibpath_var=unsupported
+runpath_var=
+link_all_deplibs=unknown
+always_export_symbols=no
+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+# include_expsyms should be a list of space-separated symbols to be *always*
+# included in the symbol list
+include_expsyms=
+# exclude_expsyms can be an egrep regular expression of symbols to exclude
+# it will be wrapped by ` (' and `)$', so one must not match beginning or
+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+# as well as any symbol that contains `d'.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+# platforms (ab)use it in PIC code, but their linkers get confused if
+# the symbol is explicitly referenced.  Since portable code cannot
+# rely on this symbol name, it's probably fine to never include it in
+# preloaded symbol tables.
+extract_expsyms_cmds=
+
+case $host_os in
+cygwin* | mingw* | pw32* )
+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+  # When not using gcc, we currently assume that we are using
+  # Microsoft Visual C++.
+  if test "$GCC" != yes; then
+    with_gnu_ld=no
+  fi
+  ;;
+
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # If archive_cmds runs LD, not CC, wlarc should be empty
+  wlarc='${wl}'
+
+  # See if GNU ld supports shared libraries.
+  case $host_os in
+  aix3* | aix4* | aix5*)
+    # On AIX, the GNU linker is very broken
+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+    ld_shlibs=no
+    cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+
+    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+    # that the semantics of dynamic libraries on AmigaOS, at least up
+    # to version 4, is to share data among multiple programs linked
+    # with the same dynamic library.  Since this doesn't match the
+    # behavior of shared libraries on other platforms, we can use
+    # them.
+    ld_shlibs=no
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag=unsupported
+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec='-L$libdir'
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+
+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+      else $CC -o impgen impgen.c ; fi)~
+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+
+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+
+    # cygwin and mingw dlls have different entry points and sets of symbols
+    # to exclude.
+    # FIXME: what about values for MSVC?
+    dll_entry=__cygwin_dll_entry@12
+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
+    case $host_os in
+    mingw*)
+      # mingw values
+      dll_entry=_DllMainCRTStartup@12
+      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
+      ;;
+    esac
+
+    # mingw and cygwin differ, and it's simplest to just exclude the union
+    # of the two symbol sets.
+    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
+
+    # recent cygwin and mingw systems supply a stub DllMain which the user
+    # can override, but on older systems we have to supply one (in ltdll.c)
+    if test "x$lt_cv_need_dllmain" = "xyes"; then
+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+    else
+      ltdll_obj=
+      ltdll_cmds=
+    fi
+
+    # Extract the symbol export list from an `--export-all' def file,
+    # then regenerate the def file from the symbol export list, so that
+    # the compiled dll only exports the symbol export list.
+    # Be careful not to strip the DATA tag left be newer dlltools.
+    export_symbols_cmds="$ltdll_cmds"'
+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+
+    # If the export-symbols file already is a .def file (1st line
+    # is EXPORTS), use it as is.
+    # If DATA tags from a recent dlltool are present, honour them!
+    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
+        cp $export_symbols $output_objdir/$soname-def;
+      else
+        echo EXPORTS > $output_objdir/$soname-def;
+        _lt_hint=1;
+        cat $export_symbols | while read symbol; do
+         set dummy \$symbol;
+         case \$# in
+           2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+           *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
+         esac;
+         _lt_hint=`expr 1 + \$_lt_hint`;
+        done;
+      fi~
+      '"$ltdll_cmds"'
+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+      wlarc=
+    else
+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    fi
+    ;;
+
+  solaris* | sysv5*)
+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      ld_shlibs=no
+      cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  sunos4*)
+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    wlarc=
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+  esac
+
+  if test "$ld_shlibs" = yes; then
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    case $host_os in
+    cygwin* | mingw* | pw32*)
+      # dlltool doesn't understand --whole-archive et. al.
+      whole_archive_flag_spec=
       ;;
     *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+	whole_archive_flag_spec=
+      fi
       ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    esac
+  fi
+else
+  # PORTME fill in a description of your system's linker (not GNU ld)
+  case $host_os in
+  aix3*)
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+    # Note: this linker hardcodes the directories in LIBPATH if there
+    # are no directories specified by -L.
+    hardcode_minus_L=yes
+    if test "$GCC" = yes && test -z "$link_static_flag"; then
+      # Neither direct hardcoding nor static linking is supported with a
+      # broken collect2.
+      hardcode_direct=unsupported
+    fi
+    ;;
+
+  aix4* | aix5*)
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    archive_cmds=''
+    hardcode_libdir_separator=':'
+    if test "$GCC" = yes; then
+      collect2name=`${CC} -print-prog-name=collect2`
+      if test -f "$collect2name" && \
+	 strings "$collect2name" | grep resolve_lib_name >/dev/null
+      then
+	# We have reworked collect2
+	hardcode_direct=yes
+      else
+        # We have old collect2
+        hardcode_direct=unsupported
+        # It fails to find uninstalled libraries when the uninstalled
+        # path is not listed in the libpath.  Setting hardcode_minus_L
+        # to unsupported forces relinking
+        hardcode_minus_L=yes
+        hardcode_libdir_flag_spec='-L$libdir'
+        hardcode_libdir_separator=
+      fi
+      shared_flag='-shared'
+    else
+      if test "$host_cpu" = ia64; then
+        shared_flag='-G'
+      else
+        shared_flag='${wl}-bM:SRE'
+      fi
+      hardcode_direct=yes
+    fi
+
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      # Test if we are trying to use run time linking, or normal AIX style linking.
+      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
+      aix_use_runtimelinking=no
+      for ld_flag in $LDFLAGS; do
+        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
+          aix_use_runtimelinking=yes
+          break
+        fi
+      done
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+    # It seems that -bexpall can do strange things, so it is better to
+    # generate a list of symbols to export.
+    always_export_symbols=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+      allow_undefined_flag=' -Wl,-G'
+      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+    else
+      if test "$host_cpu" = ia64; then
+        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+       allow_undefined_flag="-znodefs"
+        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+        # Warning - without using the other run time loading flags, -berok will
+        #           link without error, but may produce a broken library.
+        allow_undefined_flag='${wl}-berok"
+        # This is a bit strange, but is similar to how AIX traditionally builds
+        # it's shared libraries.
+        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+      fi
+    fi
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    # see comment about different semantics on the GNU ld section
+    ld_shlibs=no
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec=' '
+    allow_undefined_flag=unsupported
+    # Tell ltmain to make .lib files, not .a files.
+    libext=lib
+    # FIXME: Setting linknames here is a bad hack.
+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+    # The linker will automatically build a .lib file if we build a DLL.
+    old_archive_from_new_cmds='true'
+    # FIXME: Should let the user specify the lib program.
+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+    fix_srcfile_path='`cygpath -w "$srcfile"`'
+    ;;
+
+  darwin* | rhapsody*)
+    allow_undefined_flag='-undefined suppress'
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    # We need to add '_' to the symbols in $export_symbols first
+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load $convenience'
+    ;;
+
+  freebsd1*)
+    ld_shlibs=no
+    ;;
+
+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+  # support.  Future versions do this automatically, but an explicit c++rt0.o
+  # does not break anything, and helps significantly (at the cost of a little
+  # extra space).
+  freebsd2.2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+  freebsd2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+  freebsd*)
+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  hpux9* | hpux10* | hpux11*)
+    case $host_os in
+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+    esac
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
+    export_dynamic_flag_spec='${wl}-E'
+    ;;
+
+  irix5* | irix6*)
+    if test "$GCC" = yes; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    link_all_deplibs=yes
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    else
+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+    fi
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  newsos6)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    hardcode_direct=yes
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_shlibpath_var=no
+    ;;
+
+  openbsd*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  os2*)
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    allow_undefined_flag=unsupported
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    ;;
+
+  osf3*)
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    ;;
+
+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+      #Both c and cxx compiler support -rpath directly
+      hardcode_libdir_flag_spec='-rpath $libdir'
+    fi
+    hardcode_libdir_separator=:
+    ;;
+
+  sco3.2v5*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_shlibpath_var=no
+    runpath_var=LD_RUN_PATH
+    hardcode_runpath_var=yes
+    ;;
+
+  solaris*)
+    no_undefined_flag=' -z defs'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_shlibpath_var=no
+    case $host_os in
+    solaris2.[0-5] | solaris2.[0-5].*) ;;
+    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+    esac
+    link_all_deplibs=yes
+    ;;
+
+  sunos4*)
+    if test "x$host_vendor" = xsequent; then
+      # Use $CC to link under sequent, because it throws in some extra .o
+      # files that make .init and .fini sections work.
+      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+    else
+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+    fi
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4)
+    if test "x$host_vendor" = xsno; then
+      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
+      hardcode_direct=yes # is this really true???
+    else
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+    fi
+    runpath_var='LD_RUN_PATH'
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4.3*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_shlibpath_var=no
+    export_dynamic_flag_spec='-Bexport'
+    ;;
+
+  sysv5*)
+    no_undefined_flag=' -z text'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+    hardcode_libdir_flag_spec=
+    hardcode_shlibpath_var=no
+    runpath_var='LD_RUN_PATH'
+    ;;
+
+  uts4*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_shlibpath_var=no
+    ;;
+
+  dgux*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_shlibpath_var=no
+    ;;
+
+  sysv4*MP*)
+    if test -d /usr/nec; then
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      runpath_var=LD_RUN_PATH
+      hardcode_runpath_var=yes
+      ld_shlibs=yes
+    fi
+    ;;
+
+  sysv4.2uw2*)
+    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_minus_L=no
+    hardcode_shlibpath_var=no
+    hardcode_runpath_var=yes
+    runpath_var=LD_RUN_PATH
+    ;;
+
+  sysv5uw7* | unixware7*)
+    no_undefined_flag='${wl}-z ${wl}text'
+    if test "$GCC" = yes; then
+      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+    else
+      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+    fi
+    runpath_var='LD_RUN_PATH'
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    ld_shlibs=no
+    ;;
+  esac
+fi
+echo "$as_me:5484: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6
+test "$ld_shlibs" = no && can_build_shared=no
+
+# Check hardcoding attributes.
+echo "$as_me:5489: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var"; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$hardcode_shlibpath_var" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
   else
-    echo "not updating unwritable cache $cache_file"
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
   fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+echo "$as_me:5513: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+striplib=
+old_striplib=
+echo "$as_me:5518: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:5523: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:5526: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-rm -f confcache
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { { echo "$as_me:3870: error: libtool configure failed" >&5
-echo "$as_me: error: libtool configure failed" >&2;}
-   { (exit 1); exit 1; }; }
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+# PORTME Fill in your ld.so characteristics
+echo "$as_me:5534: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}.so$major'
+  ;;
 
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:3879: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+aix4* | aix5*)
+  version_type=linux
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+       aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+           echo ' yes '
+           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+        :
+      else
+        can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
+      # lib<name>.a to let people know that these are not typical AIX shared libraries.
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}.so$major'
+    fi
+    shlibpath_var=LIBPATH
+    deplibs_check_method=pass_all
+  fi
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+beos*)
+  library_names_spec='${libname}.so'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi4*)
+  version_type=linux
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  export_dynamic_flag_spec=-rdynamic
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32*)
+  version_type=windows
+  need_version=no
+  need_lib_prefix=no
+  case $GCC,$host_os in
+  yes,cygwin*)
+    library_names_spec='$libname.dll.a'
+    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog .libs/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $rm \$dlpath'
+    ;;
+  yes,mingw*)
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+    ;;
+  yes,pw32*)
+    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
+    ;;
+  *)
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
+  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  *)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  dynamic_linker="$host_os dld.sl"
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  shlibpath_var=SHLIB_PATH
+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+  soname_spec='${libname}${release}.sl$major'
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5* | irix6*)
+  version_type=irix
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+  case $host_os in
+  irix5*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
     esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux-gnu*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+    soname_spec='${libname}${release}.so$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+openbsd*)
+  version_type=sunos
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+    need_version=no
   fi
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+os2*)
+  libname_spec='$name'
+  need_lib_prefix=no
+  library_names_spec='$libname.dll $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_version=no
+  soname_spec='${libname}${release}.so'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+dgux*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+    soname_spec='$libname.so.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$as_me:5916: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+# Report the final consequences.
+echo "$as_me:5921: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+echo "$as_me:5923: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6
+
+if test "$hardcode_action" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
 else
-  { echo "$as_me:3887: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  *)
+    echo "$as_me:5961: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 5969 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5988: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5991: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5994: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5997: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6008: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  echo "$as_me:6013: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+if test "${ac_cv_func_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 6019 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+f = dlopen;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6050: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6053: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6056: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6059: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:6069: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+if test $ac_cv_func_dlopen = yes; then
+  lt_cv_dlopen="dlopen"
+else
+  echo "$as_me:6074: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+if test "${ac_cv_func_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 6080 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+f = shl_load;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6111: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6114: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6117: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6120: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:6130: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+if test $ac_cv_func_shl_load = yes; then
+  lt_cv_dlopen="shl_load"
+else
+  echo "$as_me:6135: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 6143 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6162: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6165: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6168: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6171: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_svld_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_svld_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6182: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+if test $ac_cv_lib_svld_dlopen = yes; then
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  echo "$as_me:6187: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 6195 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shl_load ();
+int
+main ()
+{
+shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6214: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6217: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6220: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6223: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dld_shl_load=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6234: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+fi
+
+fi
+
+fi
+
+fi
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    echo "$as_me:6268: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 6279 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:6340: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6343: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+fi
+echo "$as_me:6360: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      echo "$as_me:6365: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+#line 6376 "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}
+EOF
+  if { (eval echo "$as_me:6437: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6440: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+fi
+echo "$as_me:6457: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+if test "$enable_shared" = yes && test "$GCC" = yes; then
+  case $archive_cmds in
+  *'~'*)
+    # FIXME: we may have to deal with multi-command sequences.
+    ;;
+  '$CC '*)
+    # Test whether the compiler implicitly links with -lc since on some
+    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+    # to ld, don't add -lc before -lgcc.
+    echo "$as_me:6487: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  $rm conftest*
+    echo 'static int dummy;' > conftest.$ac_ext
+
+    if { (eval echo "$as_me:6495: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6498: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+      soname=conftest
+      lib=conftest
+      libobjs=conftest.$ac_objext
+      deplibs=
+      wl=$lt_cv_prog_cc_wl
+      compiler_flags=-v
+      linker_flags=-v
+      verstring=
+      output_objdir=.
+      libname=conftest
+      save_allow_undefined_flag=$allow_undefined_flag
+      allow_undefined_flag=
+      if { (eval echo "$as_me:6512: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  echo "$as_me:6515: \$? = $ac_status" >&5
+  (exit $ac_status); }
+      then
+	lt_cv_archive_cmds_need_lc=no
+      else
+	lt_cv_archive_cmds_need_lc=yes
+      fi
+      allow_undefined_flag=$save_allow_undefined_flag
+    else
+      cat conftest.err 1>&5
+    fi
+fi
+
+    echo "$as_me:6528: result: $lt_cv_archive_cmds_need_lc" >&5
+echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
+    ;;
+  esac
+fi
+need_lc=${lt_cv_archive_cmds_need_lc-yes}
+
+# The second clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+  :
+else
+  # If there is no Makefile yet, we rely on a make rule to execute
+  # `config.status --recheck' to rerun these tests and create the
+  # libtool script then.
+  test -f Makefile && make "$ltmain"
+fi
+
+if test -f "$ltmain"; then
+  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+  $rm -f "${ofile}T"
+
+  echo creating $ofile
+
+  # Now quote all the things that may contain metacharacters while being
+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+  # variables and quote the copies for generation of the libtool script.
+  for var in echo old_CC old_CFLAGS \
+    AR AR_FLAGS CC LD LN_S NM SHELL \
+    reload_flag reload_cmds wl \
+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+    library_names_spec soname_spec \
+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+    old_striplib striplib file_magic_cmd export_symbols_cmds \
+    deplibs_check_method allow_undefined_flag no_undefined_flag \
+    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+    hardcode_libdir_flag_spec hardcode_libdir_separator  \
+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
+
+    case $var in
+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+      # Double-quote double-evaled strings.
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+      ;;
+    *)
+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  cat <<__EOF__ > "${ofile}T"
+#! $SHELL
+
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$need_lc
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# The default C compiler.
+CC=$lt_CC
+
+# Is the compiler the GNU C compiler?
+with_gcc=$GCC
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_wl
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_pic_flag
+pic_mode=$pic_mode
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_compiler_c_o
+
+# Can we write directly to a .lo ?
+compiler_o_lo=$lt_compiler_o_lo
+
+# Must we lock files when doing compilation ?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_link_static_flag
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_thread_safe_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_old_archive_cmds
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# ### END LIBTOOL CONFIG
+
+__EOF__
+
+  case $host_os in
+  aix3*)
+    cat <<\EOF >> "${ofile}T"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | os2*)
+    cat <<'EOF' >> "${ofile}T"
+      # This is a source program that is used to create dlls on Windows
+      # Don't remove nor modify the starting and closing comments
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# #  ifdef __CYGWIN32__
+# #    define __CYGWIN__ __CYGWIN32__
+# #  endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+        # This is a source program that is used to create import libraries
+        # on Windows for dlls which lack them. Don't remove nor modify the
+        # starting and closing comments
+# /* impgen.c starts here */
+# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+#
+#  This file is part of GNU libtool.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#  */
+#
+# #include <stdio.h>		/* for printf() */
+# #include <unistd.h>		/* for open(), lseek(), read() */
+# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+# #include <string.h>		/* for strdup() */
+#
+# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+# #ifndef O_BINARY
+# #define O_BINARY 0
+# #endif
+#
+# static unsigned int
+# pe_get16 (fd, offset)
+#      int fd;
+#      int offset;
+# {
+#   unsigned char b[2];
+#   lseek (fd, offset, SEEK_SET);
+#   read (fd, b, 2);
+#   return b[0] + (b[1]<<8);
+# }
+#
+# static unsigned int
+# pe_get32 (fd, offset)
+#     int fd;
+#     int offset;
+# {
+#   unsigned char b[4];
+#   lseek (fd, offset, SEEK_SET);
+#   read (fd, b, 4);
+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# static unsigned int
+# pe_as32 (ptr)
+#      void *ptr;
+# {
+#   unsigned char *b = ptr;
+#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# int
+# main (argc, argv)
+#     int argc;
+#     char *argv[];
+# {
+#     int dll;
+#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+#     unsigned long name_rvas, nexp;
+#     unsigned char *expdata, *erva;
+#     char *filename, *dll_name;
+#
+#     filename = argv[1];
+#
+#     dll = open(filename, O_RDONLY|O_BINARY);
+#     if (dll < 1)
+# 	return 1;
+#
+#     dll_name = filename;
+#
+#     for (i=0; filename[i]; i++)
+# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+# 	    dll_name = filename + i +1;
+#
+#     pe_header_offset = pe_get32 (dll, 0x3c);
+#     opthdr_ofs = pe_header_offset + 4 + 20;
+#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
+#
+#     if (num_entries < 1) /* no exports */
+# 	return 1;
+#
+#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+#     secptr = (pe_header_offset + 4 + 20 +
+# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
+#
+#     expptr = 0;
+#     for (i = 0; i < nsections; i++)
+#     {
+# 	char sname[8];
+# 	unsigned long secptr1 = secptr + 40 * i;
+# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+# 	lseek(dll, secptr1, SEEK_SET);
+# 	read(dll, sname, 8);
+# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+# 	{
+# 	    expptr = fptr + (export_rva - vaddr);
+# 	    if (export_rva + export_size > vaddr + vsize)
+# 		export_size = vsize - (export_rva - vaddr);
+# 	    break;
+# 	}
+#     }
+#
+#     expdata = (unsigned char*)malloc(export_size);
+#     lseek (dll, expptr, SEEK_SET);
+#     read (dll, expdata, export_size);
+#     erva = expdata - export_rva;
+#
+#     nexp = pe_as32 (expdata+24);
+#     name_rvas = pe_as32 (expdata+32);
+#
+#     printf ("EXPORTS\n");
+#     for (i = 0; i<nexp; i++)
+#     {
+# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+#     }
+#
+#     return 0;
+# }
+# /* impgen.c ends here */
+
+EOF
+    ;;
+  esac
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
+
+  mv -f "${ofile}T" "$ofile" || \
+    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
+  chmod +x "$ofile"
 fi
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+# Prevent multiple expansion
 
 WFLAGS_NOUNUSED=""
 WFLAGS_NOIMPLICITINT=""
@@ -3923,6 +7110,9 @@ if test "$withval" = no; then
 fi
 
 fi;
+
+db_type=unknown
+
 if test "$berkeley_db"; then
 
 for ac_header in 				\
@@ -3930,25 +7120,25 @@ for ac_header in 				\
 	db_185.h				\
 
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:3934: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:7124: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3940 "configure"
+#line 7130 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3944: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:7134: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3950: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:7140: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -3958,27 +7148,208 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3969: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:7159: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:7169: checking for db_create" >&5
+echo $ECHO_N "checking for db_create... $ECHO_C" >&6
+if test "${ac_cv_funclib_db_create+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" $berkeley_db; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 7187 "configure"
+#include "confdefs.h"
+
+  #include <stdio.h>
+  #include <db.h>
+
+int
+main ()
+{
+db_create(NULL, NULL, 0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7202: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7205: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7208: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7211: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_db_create=\${ac_cv_funclib_db_create-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_db_create"
+
+if false; then
+
+for ac_func in db_create
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7233: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 7239 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7270: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7273: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7276: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7279: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:7289: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 fi
+# db_create
+eval "ac_tr_func=HAVE_`echo db_create | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_db_create=$ac_res"
 
-echo "$as_me:3981: checking for dbopen" >&5
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_db_create=yes"
+	eval "LIB_db_create="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:7313: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_db_create=no"
+	eval "LIB_db_create="
+	echo "$as_me:7319: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_db_create=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:7333: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+  if test "$ac_cv_func_db_create" = "yes"; then
+    db_type=db3
+    if test "$ac_cv_funclib_db_create" != "yes"; then
+      DBLIB="$ac_cv_funclib_db_create"
+    else
+      DBLIB=""
+    fi
+
+cat >>confdefs.h <<\EOF
+#define HAVE_DB3 1
+EOF
+
+  else
+
+echo "$as_me:7352: checking for dbopen" >&5
 echo $ECHO_N "checking for dbopen... $ECHO_C" >&6
 if test "${ac_cv_funclib_dbopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3986,23 +7357,27 @@ else
 
 if eval "test \"\$ac_cv_func_dbopen\" != yes" ; then
 	ac_save_LIBS="$LIBS"
-	for ac_lib in $berkeley_db; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+	for ac_lib in "" $berkeley_db; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3997 "configure"
+#line 7370 "configure"
 #include "confdefs.h"
 
-#include <stdio.h>
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#endif
+    #include <stdio.h>
+    #if defined(HAVE_DB_185_H)
+    #include <db_185.h>
+    #elif defined(HAVE_DB_H)
+    #include <db.h>
+    #else
+    #error no db.h
+    #endif
 
 int
 main ()
@@ -4013,22 +7388,23 @@ dbopen(NULL, 0, 0, 0, NULL)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7391: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4019: \$? = $ac_status" >&5
+  echo "$as_me:7394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4021: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7397: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4024: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:7400: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_dbopen=\${ac_cv_funclib_dbopen-no}"
 	LIBS="$ac_save_LIBS"
@@ -4042,14 +7418,14 @@ if false; then
 
 for ac_func in dbopen
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4046: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7422: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4052 "configure"
+#line 7428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4080,29 +7456,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4086: \$? = $ac_status" >&5
+  echo "$as_me:7462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4088: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7465: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4091: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:7468: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4101: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:7478: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -4122,13 +7499,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:4125: result: yes" >&5
+	echo "$as_me:7502: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_dbopen=no"
 	eval "LIB_dbopen="
-	echo "$as_me:4131: result: no" >&5
+	echo "$as_me:7508: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -4142,12 +7519,27 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:4145: result: yes, in $ac_res" >&5
+	echo "$as_me:7522: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:4150: checking for dbm_firstkey" >&5
+    if test "$ac_cv_func_dbopen" = "yes"; then
+      db_type=db1
+      if test "$ac_cv_funclib_dbopen" != "yes"; then
+        DBLIB="$ac_cv_funclib_dbopen"
+      else
+        DBLIB=""
+      fi
+
+cat >>confdefs.h <<\EOF
+#define HAVE_DB1 1
+EOF
+
+    fi
+  fi
+
+echo "$as_me:7542: checking for dbm_firstkey" >&5
 echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
 if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4155,42 +7547,50 @@ else
 
 if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
 	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $berkeley_db gdbm ndbm; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+	for ac_lib in $ac_cv_funclib_dbopen $ac_cv_funclib_db_create; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 4166 "configure"
+#line 7560 "configure"
 #include "confdefs.h"
 
+  #include <stdio.h>
+  #define DB_DBM_HSEARCH 1
+  #include <db.h>
+  DBM *dbm;
+
 int
 main ()
 {
-dbm_firstkey()
+dbm_firstkey(NULL)
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4181: \$? = $ac_status" >&5
+  echo "$as_me:7580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4183: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4186: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:7586: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
 	LIBS="$ac_save_LIBS"
@@ -4204,14 +7604,14 @@ if false; then
 
 for ac_func in dbm_firstkey
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4208: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7608: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4214 "configure"
+#line 7614 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4242,29 +7642,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4248: \$? = $ac_status" >&5
+  echo "$as_me:7648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4250: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7651: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4253: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:7654: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4263: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:7664: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -4284,13 +7685,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:4287: result: yes" >&5
+	echo "$as_me:7688: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_dbm_firstkey=no"
 	eval "LIB_dbm_firstkey="
-	echo "$as_me:4293: result: no" >&5
+	echo "$as_me:7694: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -4304,76 +7705,160 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:4307: result: yes, in $ac_res" >&5
+	echo "$as_me:7708: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:4312: checking for db_create" >&5
-echo $ECHO_N "checking for db_create... $ECHO_C" >&6
-if test "${ac_cv_funclib_db_create+set}" = set; then
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+
+cat >>confdefs.h <<\EOF
+#define HAVE_DB_NDBM 1
+EOF
+
+  else
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+  fi
+
+fi # berkeley db
+
+if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
+
+for ac_header in 				\
+	dbm.h					\
+	ndbm.h					\
+
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:7739: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 7745 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:7749: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:7755: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:7774: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:7784: checking for dbm_firstkey" >&5
+echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
+if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
+if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
 	ac_save_LIBS="$LIBS"
-	for ac_lib in "" $berkeley_db; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+	for ac_lib in "" ndbm; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 4328 "configure"
+#line 7802 "configure"
 #include "confdefs.h"
 
+  #include <stdio.h>
+  #if defined(HAVE_NDBM_H)
+  #include <ndbm.h>
+  #elif defined(HAVE_DBM_H)
+  #include <dbm.h>
+  #else
+  #error no ndbm.h
+  #endif
+  DBM *dbm;
+
 int
 main ()
 {
-db_create()
+dbm_firstkey(NULL)
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4343: \$? = $ac_status" >&5
+  echo "$as_me:7827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4345: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7830: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4348: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
+  echo "$as_me:7833: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
-	eval "ac_cv_funclib_db_create=\${ac_cv_funclib_db_create-no}"
+	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
 	LIBS="$ac_save_LIBS"
 fi
 
 fi
 
-eval "ac_res=\$ac_cv_funclib_db_create"
+eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
 
 if false; then
 
-for ac_func in db_create
+for ac_func in dbm_firstkey
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:4370: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7855: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4376 "configure"
+#line 7861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -4404,59 +7889,60 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4410: \$? = $ac_status" >&5
+  echo "$as_me:7895: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4412: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7898: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4415: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:7901: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4425: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:7911: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 fi
-# db_create
-eval "ac_tr_func=HAVE_`echo db_create | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+# dbm_firstkey
+eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_db_create=$ac_res"
+eval "LIB_dbm_firstkey=$ac_res"
 
 case "$ac_res" in
 	yes)
-	eval "ac_cv_func_db_create=yes"
-	eval "LIB_db_create="
+	eval "ac_cv_func_dbm_firstkey=yes"
+	eval "LIB_dbm_firstkey="
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:4449: result: yes" >&5
+	echo "$as_me:7935: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
-	eval "ac_cv_func_db_create=no"
-	eval "LIB_db_create="
-	echo "$as_me:4455: result: no" >&5
+	eval "ac_cv_func_dbm_firstkey=no"
+	eval "LIB_dbm_firstkey="
+	echo "$as_me:7941: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
-	eval "ac_cv_func_db_create=yes"
+	eval "ac_cv_func_dbm_firstkey=yes"
 	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
@@ -4466,20 +7952,270 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:4469: result: yes, in $ac_res" >&5
+	echo "$as_me:7955: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-DBLIB="$LIB_dbopen"
-if test "$LIB_dbopen" != "$LIB_db_create"; then
-        DBLIB="$DBLIB $LIB_db_create"
+  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+    else
+      LIB_NDBM=""
+    fi
+
+cat >>confdefs.h <<\EOF
+#define HAVE_NDBM 1
+EOF
+    if test "$db_type" = "unknown"; then
+      db_type=ndbm
+      DBLIB="$LIB_NDBM"
+    fi
+  else
+
+    $as_unset ac_cv_func_dbm_firstkey
+    $as_unset ac_cv_funclib_dbm_firstkey
+
+for ac_header in 				\
+	  gdbm/ndbm.h				\
+
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:7984: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 7990 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:7994: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:8000: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:8019: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+echo "$as_me:8029: checking for dbm_firstkey" >&5
+echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
+if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" gdbm; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 8047 "configure"
+#include "confdefs.h"
+
+    #include <stdio.h>
+    #include <gdbm/ndbm.h>
+    DBM *dbm;
+
+int
+main ()
+{
+dbm_firstkey(NULL)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8066: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8072: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
+
+if false; then
+
+for ac_func in dbm_firstkey
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8094: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 8100 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8131: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8134: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8140: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
 fi
-if test "$LIB_dbopen" != "$LIB_dbm_firstkey"; then
-	DBLIB="$DBLIB $LIB_dbm_firstkey"
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:8150: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# dbm_firstkey
+eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_dbm_firstkey=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_dbm_firstkey=yes"
+	eval "LIB_dbm_firstkey="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
 
-echo "$as_me:4482: checking for inline" >&5
+	echo "$as_me:8174: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_dbm_firstkey=no"
+	eval "LIB_dbm_firstkey="
+	echo "$as_me:8180: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_dbm_firstkey=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:8194: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
+      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
+	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+      else
+	LIB_NDBM=""
+      fi
+
+cat >>confdefs.h <<\EOF
+#define HAVE_NDBM 1
+EOF
+      if test "$db_type" = "unknown"; then
+	db_type=ndbm
+	DBLIB="$LIB_NDBM"
+      fi
+    fi
+  fi
+
+fi # unknown
+
+echo "$as_me:8218: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4487,24 +8223,26 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 4490 "configure"
+#line 8226 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
+static $ac_kw int static_foo () {return 0; }
 $ac_kw int foo () {return 0; }
 #endif
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4501: \$? = $ac_status" >&5
+  echo "$as_me:8238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4503: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4506: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8244: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5
@@ -4514,7 +8252,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:4517: result: $ac_cv_c_inline" >&5
+echo "$as_me:8255: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -4529,13 +8267,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:4532: checking for an ANSI C-conforming const" >&5
+echo "$as_me:8270: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4538 "configure"
+#line 8276 "configure"
 #include "confdefs.h"
 
 int
@@ -4593,16 +8331,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8334: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4599: \$? = $ac_status" >&5
+  echo "$as_me:8337: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4601: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8340: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4604: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8343: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4611,7 +8350,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4614: result: $ac_cv_c_const" >&5
+echo "$as_me:8353: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -4621,13 +8360,13 @@ EOF
 
 fi
 
-echo "$as_me:4624: checking for ANSI C header files" >&5
+echo "$as_me:8363: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4630 "configure"
+#line 8369 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4635,14 +8374,14 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4638: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:8377: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:4644: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8383: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -4663,7 +8402,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4666 "configure"
+#line 8405 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -4681,7 +8420,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 4684 "configure"
+#line 8423 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -4702,7 +8441,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4705 "configure"
+#line 8444 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -4728,15 +8467,16 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4734: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:4735: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:8473: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:8475: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4738: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8478: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -4744,11 +8484,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:4751: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8491: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -4758,61 +8498,60 @@ EOF
 
 fi
 
-for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:4764: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:8507: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4770 "configure"
+#line 8513 "configure"
 #include "confdefs.h"
+$ac_includes_default
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4774: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:4780: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  echo "$as_me:8522: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8525: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8528: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4799: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:8538: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
-echo "$as_me:4809: checking for size_t" >&5
+echo "$as_me:8548: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4815 "configure"
+#line 8554 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4827,16 +8566,17 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4833: \$? = $ac_status" >&5
+  echo "$as_me:8572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4835: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8575: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4838: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8578: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4845,7 +8585,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4848: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8588: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -4857,13 +8597,13 @@ EOF
 
 fi
 
-echo "$as_me:4860: checking for pid_t" >&5
+echo "$as_me:8600: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4866 "configure"
+#line 8606 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4878,16 +8618,17 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4884: \$? = $ac_status" >&5
+  echo "$as_me:8624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4886: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8627: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4889: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8630: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -4896,7 +8637,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4899: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:8640: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -4908,13 +8649,13 @@ EOF
 
 fi
 
-echo "$as_me:4911: checking for uid_t in sys/types.h" >&5
+echo "$as_me:8652: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4917 "configure"
+#line 8658 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -4928,7 +8669,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:4931: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:8672: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -4942,13 +8683,13 @@ EOF
 
 fi
 
-echo "$as_me:4945: checking return type of signal handlers" >&5
+echo "$as_me:8686: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4951 "configure"
+#line 8692 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4970,16 +8711,17 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4976: \$? = $ac_status" >&5
+  echo "$as_me:8717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:4978: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4981: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8723: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
   echo "$as_me: failed program was:" >&5
@@ -4988,7 +8730,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4991: result: $ac_cv_type_signal" >&5
+echo "$as_me:8733: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -5003,13 +8745,13 @@ EOF
 
 fi
 
-echo "$as_me:5006: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:8748: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5012 "configure"
+#line 8754 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -5018,22 +8760,24 @@ else
 int
 main ()
 {
-struct tm *tp;
+if ((struct tm *) 0)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5027: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5030: \$? = $ac_status" >&5
+  echo "$as_me:8773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5032: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:8776: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5035: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8779: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5042,7 +8786,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5045: result: $ac_cv_header_time" >&5
+echo "$as_me:8789: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -5054,25 +8798,25 @@ fi
 
 for ac_header in standards.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5058: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:8802: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5064 "configure"
+#line 8808 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5068: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:8812: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5074: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8818: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -5082,19 +8826,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5093: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:8837: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -5104,13 +8848,13 @@ for i in netinet/ip.h netinet/tcp.h; do
 
 cv=`echo "$i" | sed 'y%./+-%__p_%'`
 
-echo "$as_me:5107: checking for $i" >&5
+echo "$as_me:8851: checking for $i" >&5
 echo $ECHO_N "checking for $i... $ECHO_C" >&6
 if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5113 "configure"
+#line 8857 "configure"
 #include "confdefs.h"
 \
 #ifdef HAVE_STANDARDS_H
@@ -5119,14 +8863,14 @@ else
 #include <$i>
 
 _ACEOF
-if { (eval echo "$as_me:5122: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:8866: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5128: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8872: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -5144,7 +8888,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5147: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+echo "$as_me:8891: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
 echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
 ac_res=`eval echo \\$ac_cv_header_$cv`
 if test "$ac_res" = yes; then
@@ -5159,25 +8903,25 @@ if false;then
 
 for ac_header in netinet/ip.h netinet/tcp.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5163: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:8907: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5169 "configure"
+#line 8913 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5173: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:8917: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5179: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:8923: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -5187,19 +8931,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5198: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:8942: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -5209,14 +8953,14 @@ fi
 
 for ac_func in getlogin setlogin
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5213: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:8957: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5219 "configure"
+#line 8963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5247,36 +8991,37 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5253: \$? = $ac_status" >&5
+  echo "$as_me:8997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5255: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9000: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5258: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:9003: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5268: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9013: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 if test "$ac_cv_func_getlogin" = yes; then
-echo "$as_me:5279: checking if getlogin is posix" >&5
+echo "$as_me:9024: checking if getlogin is posix" >&5
 echo $ECHO_N "checking if getlogin is posix... $ECHO_C" >&6
 if test "${ac_cv_func_getlogin_posix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5289,7 +9034,7 @@ else
 fi
 
 fi
-echo "$as_me:5292: result: $ac_cv_func_getlogin_posix" >&5
+echo "$as_me:9037: result: $ac_cv_func_getlogin_posix" >&5
 echo "${ECHO_T}$ac_cv_func_getlogin_posix" >&6
 if test "$ac_cv_func_getlogin_posix" = yes; then
 
@@ -5300,7 +9045,7 @@ EOF
 fi
 fi
 
-echo "$as_me:5303: checking if realloc if broken" >&5
+echo "$as_me:9048: checking if realloc if broken" >&5
 echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
 if test "${ac_cv_func_realloc_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5311,7 +9056,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5314 "configure"
+#line 9059 "configure"
 #include "confdefs.h"
 
 #include <stddef.h>
@@ -5324,15 +9069,16 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5330: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:5331: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:9075: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:9077: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5334: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9080: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -5340,11 +9086,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_realloc_broken=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:5347: result: $ac_cv_func_realloc_broken" >&5
+echo "$as_me:9093: result: $ac_cv_func_realloc_broken" >&5
 echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
 if test "$ac_cv_func_realloc_broken" = yes ; then
 
@@ -5371,13 +9117,13 @@ if test -z "$WFLAGS" -a "$GCC" = "yes"; then
   WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
 fi
 
-echo "$as_me:5374: checking for ssize_t" >&5
+echo "$as_me:9120: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5380 "configure"
+#line 9126 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5395,7 +9141,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5398: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:9144: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = no; then
 
@@ -5406,13 +9152,13 @@ EOF
 fi
 
 cv=`echo "long long" | sed 'y%./+- %__p__%'`
-echo "$as_me:5409: checking for long long" >&5
+echo "$as_me:9155: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5415 "configure"
+#line 9161 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -5429,16 +9175,17 @@ long long foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5435: \$? = $ac_status" >&5
+  echo "$as_me:9181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5437: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9184: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5440: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9187: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -5448,18 +9195,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:5451: result: $ac_foo" >&5
+echo "$as_me:9198: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:5456: checking for long long" >&5
+	echo "$as_me:9203: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5462 "configure"
+#line 9209 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5474,16 +9221,17 @@ if (sizeof (long long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5480: \$? = $ac_status" >&5
+  echo "$as_me:9227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5482: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9230: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5485: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9233: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -5492,7 +9240,7 @@ ac_cv_type_long_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5495: result: $ac_cv_type_long_long" >&5
+echo "$as_me:9243: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6
 if test $ac_cv_type_long_long = yes; then
 
@@ -5515,16 +9263,12 @@ for ac_header in \
 	arpa/nameser.h				\
 	config.h				\
 	crypt.h					\
-	dbm.h					\
-	db.h					\
 	dirent.h				\
 	errno.h					\
 	err.h					\
 	fcntl.h					\
-	gdbm/ndbm.h				\
 	grp.h					\
 	ifaddrs.h				\
-	ndbm.h					\
 	net/if.h				\
 	netdb.h					\
 	netinet/in.h				\
@@ -5535,9 +9279,9 @@ for ac_header in \
 	paths.h					\
 	pwd.h					\
 	resolv.h				\
-	rpcsvc/dbm.h				\
 	rpcsvc/ypclnt.h				\
 	shadow.h				\
+	sys/bswap.h				\
 	sys/ioctl.h				\
 	sys/param.h				\
 	sys/proc.h				\
@@ -5559,28 +9303,27 @@ for ac_header in \
 	usersec.h				\
 	util.h					\
 	vis.h					\
-	winsock.h				\
 
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:5566: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:9309: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5572 "configure"
+#line 9315 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5576: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:9319: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:5582: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9325: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -5590,19 +9333,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5601: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:9344: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -5648,19 +9391,20 @@ if test "$withval" = "no"; then
 	ac_cv_lib_ipv6=no
 fi
 fi;
+save_CFLAGS="${CFLAGS}"
 if test "${ac_cv_lib_ipv6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   v6type=unknown
 v6lib=none
 
-echo "$as_me:5657: checking ipv6 stack type" >&5
+echo "$as_me:9401: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 for i in v6d toshiba kame inria zeta linux; do
 	case $i in
 	v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5663 "configure"
+#line 9407 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/types.h>
@@ -5679,7 +9423,7 @@ rm -f conftest*
 		;;
 	toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5682 "configure"
+#line 9426 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -5698,7 +9442,7 @@ rm -f conftest*
 		;;
 	kame)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5701 "configure"
+#line 9445 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -5717,7 +9461,7 @@ rm -f conftest*
 		;;
 	inria)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5720 "configure"
+#line 9464 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -5734,7 +9478,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5737 "configure"
+#line 9481 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -5764,7 +9508,7 @@ rm -f conftest*
 		break
 	fi
 done
-echo "$as_me:5767: result: $v6type" >&5
+echo "$as_me:9511: result: $v6type" >&5
 echo "${ECHO_T}$v6type" >&6
 
 if test "$v6lib" != "none"; then
@@ -5776,7 +9520,7 @@ if test "$v6lib" != "none"; then
 	done
 fi
 cat >conftest.$ac_ext <<_ACEOF
-#line 5779 "configure"
+#line 9523 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -5811,28 +9555,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5817: \$? = $ac_status" >&5
+  echo "$as_me:9561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5819: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9564: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5822: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9567: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ipv6=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_ipv6=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:5833: checking for IPv6" >&5
+echo "$as_me:9578: checking for IPv6" >&5
 echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
-echo "$as_me:5835: result: $ac_cv_lib_ipv6" >&5
+echo "$as_me:9580: result: $ac_cv_lib_ipv6" >&5
 echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
 if test "$ac_cv_lib_ipv6" = yes; then
 
@@ -5840,9 +9585,76 @@ cat >>confdefs.h <<\EOF
 #define HAVE_IPV6 1
 EOF
 
+else
+  CFLAGS="${save_CFLAGS}"
+fi
+
+if test "$ac_cv_lib_ipv6" = yes; then
+	echo "$as_me:9593: checking for in6addr_loopback" >&5
+echo $ECHO_N "checking for in6addr_loopback... $ECHO_C" >&6
+if test "${ac_cv_var_in6addr_loopback+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+	cat >conftest.$ac_ext <<_ACEOF
+#line 9600 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+int
+main ()
+{
+
+struct sockaddr_in6 sin6;
+sin6.sin6_addr = in6addr_loopback;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9627: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9630: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9633: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9636: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_var_in6addr_loopback=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_var_in6addr_loopback=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:9646: result: $ac_cv_var_in6addr_loopback" >&5
+echo "${ECHO_T}$ac_cv_var_in6addr_loopback" >&6
+	if test "$ac_cv_var_in6addr_loopback" = yes; then
 
-echo "$as_me:5845: checking for socket" >&5
+cat >>confdefs.h <<\EOF
+#define HAVE_IN6ADDR_LOOPBACK 1
+EOF
+
+	fi
+fi
+
+echo "$as_me:9657: checking for socket" >&5
 echo $ECHO_N "checking for socket... $ECHO_C" >&6
 if test "${ac_cv_funclib_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5851,14 +9663,16 @@ else
 if eval "test \"\$ac_cv_func_socket\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" socket; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 5861 "configure"
+#line 9675 "configure"
 #include "confdefs.h"
 
 int
@@ -5870,22 +9684,23 @@ socket()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5876: \$? = $ac_status" >&5
+  echo "$as_me:9690: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5878: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9693: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5881: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9696: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
 	LIBS="$ac_save_LIBS"
@@ -5899,14 +9714,14 @@ if false; then
 
 for ac_func in socket
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:5903: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9718: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5909 "configure"
+#line 9724 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5937,29 +9752,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5943: \$? = $ac_status" >&5
+  echo "$as_me:9758: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:5945: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9761: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5948: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:9764: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5958: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9774: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -5979,13 +9795,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:5982: result: yes" >&5
+	echo "$as_me:9798: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_socket=no"
 	eval "LIB_socket="
-	echo "$as_me:5988: result: no" >&5
+	echo "$as_me:9804: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -5999,7 +9815,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6002: result: yes, in $ac_res" >&5
+	echo "$as_me:9818: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6008,7 +9824,7 @@ if test -n "$LIB_socket"; then
 	LIBS="$LIB_socket $LIBS"
 fi
 
-echo "$as_me:6011: checking for gethostbyname" >&5
+echo "$as_me:9827: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_funclib_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6017,14 +9833,16 @@ else
 if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" nsl; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 6027 "configure"
+#line 9845 "configure"
 #include "confdefs.h"
 
 int
@@ -6036,22 +9854,23 @@ gethostbyname()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6042: \$? = $ac_status" >&5
+  echo "$as_me:9860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6044: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9863: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6047: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:9866: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
 	LIBS="$ac_save_LIBS"
@@ -6065,14 +9884,14 @@ if false; then
 
 for ac_func in gethostbyname
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6069: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9888: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6075 "configure"
+#line 9894 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6103,29 +9922,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9925: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6109: \$? = $ac_status" >&5
+  echo "$as_me:9928: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6111: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9931: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6114: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:9934: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6124: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:9944: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -6145,13 +9965,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:6148: result: yes" >&5
+	echo "$as_me:9968: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_gethostbyname=no"
 	eval "LIB_gethostbyname="
-	echo "$as_me:6154: result: no" >&5
+	echo "$as_me:9974: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -6165,7 +9985,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6168: result: yes, in $ac_res" >&5
+	echo "$as_me:9988: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6174,7 +9994,7 @@ if test -n "$LIB_gethostbyname"; then
 	LIBS="$LIB_gethostbyname $LIBS"
 fi
 
-echo "$as_me:6177: checking for syslog" >&5
+echo "$as_me:9997: checking for syslog" >&5
 echo $ECHO_N "checking for syslog... $ECHO_C" >&6
 if test "${ac_cv_funclib_syslog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6183,14 +10003,16 @@ else
 if eval "test \"\$ac_cv_func_syslog\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" syslog; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 6193 "configure"
+#line 10015 "configure"
 #include "confdefs.h"
 
 int
@@ -6202,22 +10024,23 @@ syslog()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6208: \$? = $ac_status" >&5
+  echo "$as_me:10030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6210: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10033: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6213: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10036: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
 	LIBS="$ac_save_LIBS"
@@ -6231,14 +10054,14 @@ if false; then
 
 for ac_func in syslog
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6235: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10058: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6241 "configure"
+#line 10064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6269,29 +10092,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6275: \$? = $ac_status" >&5
+  echo "$as_me:10098: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6277: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10101: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6280: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:10104: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6290: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10114: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -6311,13 +10135,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:6314: result: yes" >&5
+	echo "$as_me:10138: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_syslog=no"
 	eval "LIB_syslog="
-	echo "$as_me:6320: result: no" >&5
+	echo "$as_me:10144: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -6331,7 +10155,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6334: result: yes, in $ac_res" >&5
+	echo "$as_me:10158: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6340,7 +10164,7 @@ if test -n "$LIB_syslog"; then
 	LIBS="$LIB_syslog $LIBS"
 fi
 
-echo "$as_me:6343: checking for gethostbyname2" >&5
+echo "$as_me:10167: checking for gethostbyname2" >&5
 echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
 if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6349,14 +10173,16 @@ else
 if eval "test \"\$ac_cv_func_gethostbyname2\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" inet6 ip6; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 6359 "configure"
+#line 10185 "configure"
 #include "confdefs.h"
 
 int
@@ -6368,22 +10194,23 @@ gethostbyname2()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6374: \$? = $ac_status" >&5
+  echo "$as_me:10200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6376: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6379: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10206: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
 	LIBS="$ac_save_LIBS"
@@ -6397,14 +10224,14 @@ if false; then
 
 for ac_func in gethostbyname2
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6401: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10228: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6407 "configure"
+#line 10234 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6435,29 +10262,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6441: \$? = $ac_status" >&5
+  echo "$as_me:10268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6443: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10271: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6446: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:10274: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6456: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10284: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -6477,13 +10305,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:6480: result: yes" >&5
+	echo "$as_me:10308: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_gethostbyname2=no"
 	eval "LIB_gethostbyname2="
-	echo "$as_me:6486: result: no" >&5
+	echo "$as_me:10314: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -6497,7 +10325,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6500: result: yes, in $ac_res" >&5
+	echo "$as_me:10328: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6506,7 +10334,7 @@ if test -n "$LIB_gethostbyname2"; then
 	LIBS="$LIB_gethostbyname2 $LIBS"
 fi
 
-echo "$as_me:6509: checking for res_search" >&5
+echo "$as_me:10337: checking for res_search" >&5
 echo $ECHO_N "checking for res_search... $ECHO_C" >&6
 if test "${ac_cv_funclib_res_search+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6515,14 +10343,16 @@ else
 if eval "test \"\$ac_cv_func_res_search\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 6525 "configure"
+#line 10355 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6548,22 +10378,23 @@ res_search(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6554: \$? = $ac_status" >&5
+  echo "$as_me:10384: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6556: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6559: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10390: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
 	LIBS="$ac_save_LIBS"
@@ -6577,14 +10408,14 @@ if false; then
 
 for ac_func in res_search
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6581: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10412: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6587 "configure"
+#line 10418 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6615,29 +10446,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6621: \$? = $ac_status" >&5
+  echo "$as_me:10452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6623: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10455: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6626: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:10458: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6636: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10468: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -6657,13 +10489,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:6660: result: yes" >&5
+	echo "$as_me:10492: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_res_search=no"
 	eval "LIB_res_search="
-	echo "$as_me:6666: result: no" >&5
+	echo "$as_me:10498: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -6677,7 +10509,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6680: result: yes, in $ac_res" >&5
+	echo "$as_me:10512: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6686,7 +10518,7 @@ if test -n "$LIB_res_search"; then
 	LIBS="$LIB_res_search $LIBS"
 fi
 
-echo "$as_me:6689: checking for dn_expand" >&5
+echo "$as_me:10521: checking for dn_expand" >&5
 echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
 if test "${ac_cv_funclib_dn_expand+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6695,14 +10527,16 @@ else
 if eval "test \"\$ac_cv_func_dn_expand\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 6705 "configure"
+#line 10539 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6728,22 +10562,23 @@ dn_expand(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6734: \$? = $ac_status" >&5
+  echo "$as_me:10568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6736: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6739: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10574: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
 	LIBS="$ac_save_LIBS"
@@ -6757,14 +10592,14 @@ if false; then
 
 for ac_func in dn_expand
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:6761: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:10596: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6767 "configure"
+#line 10602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6795,29 +10630,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6801: \$? = $ac_status" >&5
+  echo "$as_me:10636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6803: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10639: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6806: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:10642: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6816: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:10652: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -6837,13 +10673,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:6840: result: yes" >&5
+	echo "$as_me:10676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_dn_expand=no"
 	eval "LIB_dn_expand="
-	echo "$as_me:6846: result: no" >&5
+	echo "$as_me:10682: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -6857,7 +10693,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:6860: result: yes, in $ac_res" >&5
+	echo "$as_me:10696: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -6866,7 +10702,7 @@ if test -n "$LIB_dn_expand"; then
 	LIBS="$LIB_dn_expand $LIBS"
 fi
 
-echo "$as_me:6869: checking for working snprintf" >&5
+echo "$as_me:10705: checking for working snprintf" >&5
 echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
 if test "${ac_cv_func_snprintf_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6876,7 +10712,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6879 "configure"
+#line 10715 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6889,15 +10725,16 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6895: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:6896: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:10731: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6899: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10736: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -6905,10 +10742,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_snprintf_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6911: result: $ac_cv_func_snprintf_working" >&5
+echo "$as_me:10748: result: $ac_cv_func_snprintf_working" >&5
 echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
 
 if test "$ac_cv_func_snprintf_working" = yes; then
@@ -6921,13 +10758,13 @@ fi
 if test "$ac_cv_func_snprintf_working" = yes; then
 
 if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
-echo "$as_me:6924: checking if snprintf needs a prototype" >&5
+echo "$as_me:10761: checking if snprintf needs a prototype" >&5
 echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_snprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6930 "configure"
+#line 10767 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6942,16 +10779,17 @@ snprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6948: \$? = $ac_status" >&5
+  echo "$as_me:10785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:6950: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:10788: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6953: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10791: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_snprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -6960,7 +10798,7 @@ eval "ac_cv_func_snprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6963: result: $ac_cv_func_snprintf_noproto" >&5
+echo "$as_me:10801: result: $ac_cv_func_snprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
 
 if test "$ac_cv_func_snprintf_noproto" = yes; then
@@ -6975,7 +10813,7 @@ fi
 
 fi
 
-echo "$as_me:6978: checking for working vsnprintf" >&5
+echo "$as_me:10816: checking for working vsnprintf" >&5
 echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
 if test "${ac_cv_func_vsnprintf_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6985,7 +10823,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6988 "configure"
+#line 10826 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7008,15 +10846,16 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7014: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:7015: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:10852: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:10854: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7018: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10857: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -7024,10 +10863,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_vsnprintf_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:7030: result: $ac_cv_func_vsnprintf_working" >&5
+echo "$as_me:10869: result: $ac_cv_func_vsnprintf_working" >&5
 echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
 
 if test "$ac_cv_func_vsnprintf_working" = yes; then
@@ -7040,13 +10879,13 @@ fi
 if test "$ac_cv_func_vsnprintf_working" = yes; then
 
 if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
-echo "$as_me:7043: checking if vsnprintf needs a prototype" >&5
+echo "$as_me:10882: checking if vsnprintf needs a prototype" >&5
 echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7049 "configure"
+#line 10888 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7061,16 +10900,17 @@ vsnprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7067: \$? = $ac_status" >&5
+  echo "$as_me:10906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7069: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:10909: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7072: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10912: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_vsnprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7079,7 +10919,7 @@ eval "ac_cv_func_vsnprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7082: result: $ac_cv_func_vsnprintf_noproto" >&5
+echo "$as_me:10922: result: $ac_cv_func_vsnprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
 
 if test "$ac_cv_func_vsnprintf_noproto" = yes; then
@@ -7094,14 +10934,14 @@ fi
 
 fi
 
-echo "$as_me:7097: checking for working glob" >&5
+echo "$as_me:10937: checking for working glob" >&5
 echo $ECHO_N "checking for working glob... $ECHO_C" >&6
 if test "${ac_cv_func_glob_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_func_glob_working=yes
 cat >conftest.$ac_ext <<_ACEOF
-#line 7104 "configure"
+#line 10944 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7110,32 +10950,40 @@ int
 main ()
 {
 
-glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE, NULL, NULL);
+glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
+#ifdef GLOB_MAXPATH
+GLOB_MAXPATH
+#else
+GLOB_LIMIT
+#endif
+,
+NULL, NULL);
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7123: \$? = $ac_status" >&5
+  echo "$as_me:10970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7125: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:10973: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7128: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:10976: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_glob_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7138: result: $ac_cv_func_glob_working" >&5
+echo "$as_me:10986: result: $ac_cv_func_glob_working" >&5
 echo "${ECHO_T}$ac_cv_func_glob_working" >&6
 
 if test "$ac_cv_func_glob_working" = yes; then
@@ -7148,13 +10996,13 @@ fi
 if test "$ac_cv_func_glob_working" = yes; then
 
 if test "$ac_cv_func_glob+set" != set -o "$ac_cv_func_glob" = yes; then
-echo "$as_me:7151: checking if glob needs a prototype" >&5
+echo "$as_me:10999: checking if glob needs a prototype" >&5
 echo $ECHO_N "checking if glob needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_glob_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7157 "configure"
+#line 11005 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <glob.h>
@@ -7170,16 +11018,17 @@ glob(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7176: \$? = $ac_status" >&5
+  echo "$as_me:11024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7178: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11027: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7181: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11030: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_glob_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7188,7 +11037,7 @@ eval "ac_cv_func_glob_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7191: result: $ac_cv_func_glob_noproto" >&5
+echo "$as_me:11040: result: $ac_cv_func_glob_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_glob_noproto" >&6
 
 if test "$ac_cv_func_glob_noproto" = yes; then
@@ -7220,8 +11069,14 @@ for ac_func in 				\
 	asprintf				\
 	cgetent					\
 	getconfattr				\
+	getprogname				\
 	getrlimit				\
 	getspnam				\
+	initstate				\
+	issetugid				\
+	random					\
+	setprogname				\
+	setstate				\
 	strsvis					\
 	strunvis				\
 	strvis					\
@@ -7236,14 +11091,14 @@ for ac_func in 				\
 	vis					\
 
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7240: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:11095: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7246 "configure"
+#line 11101 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7274,29 +11129,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11132: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7280: \$? = $ac_status" >&5
+  echo "$as_me:11135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7282: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11138: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:11141: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7295: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:11151: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -7306,7 +11162,7 @@ if test "$ac_cv_func_cgetent" = no; then
 	LIBOBJS="$LIBOBJS getcap.o"
 fi
 
-echo "$as_me:7309: checking for getsockopt" >&5
+echo "$as_me:11165: checking for getsockopt" >&5
 echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
 if test "${ac_cv_funclib_getsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7315,14 +11171,16 @@ else
 if eval "test \"\$ac_cv_func_getsockopt\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 7325 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -7339,22 +11197,23 @@ getsockopt(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7345: \$? = $ac_status" >&5
+  echo "$as_me:11203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7347: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11206: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7350: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11209: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
 	LIBS="$ac_save_LIBS"
@@ -7368,14 +11227,14 @@ if false; then
 
 for ac_func in getsockopt
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7372: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:11231: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7378 "configure"
+#line 11237 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7406,29 +11265,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7412: \$? = $ac_status" >&5
+  echo "$as_me:11271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7414: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11274: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7417: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:11277: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7427: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:11287: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -7448,13 +11308,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:7451: result: yes" >&5
+	echo "$as_me:11311: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_getsockopt=no"
 	eval "LIB_getsockopt="
-	echo "$as_me:7457: result: no" >&5
+	echo "$as_me:11317: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -7468,12 +11328,12 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:7471: result: yes, in $ac_res" >&5
+	echo "$as_me:11331: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:7476: checking for setsockopt" >&5
+echo "$as_me:11336: checking for setsockopt" >&5
 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_funclib_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7482,14 +11342,16 @@ else
 if eval "test \"\$ac_cv_func_setsockopt\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 7492 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -7506,22 +11368,23 @@ setsockopt(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7512: \$? = $ac_status" >&5
+  echo "$as_me:11374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7514: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11377: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7517: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11380: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
 	LIBS="$ac_save_LIBS"
@@ -7535,14 +11398,14 @@ if false; then
 
 for ac_func in setsockopt
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7539: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:11402: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7545 "configure"
+#line 11408 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7573,29 +11436,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7579: \$? = $ac_status" >&5
+  echo "$as_me:11442: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7581: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11445: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7584: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:11448: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7594: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:11458: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -7615,13 +11479,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:7618: result: yes" >&5
+	echo "$as_me:11482: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_setsockopt=no"
 	eval "LIB_setsockopt="
-	echo "$as_me:7624: result: no" >&5
+	echo "$as_me:11488: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -7635,12 +11499,12 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:7638: result: yes, in $ac_res" >&5
+	echo "$as_me:11502: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:7643: checking for hstrerror" >&5
+echo "$as_me:11507: checking for hstrerror" >&5
 echo $ECHO_N "checking for hstrerror... $ECHO_C" >&6
 if test "${ac_cv_funclib_hstrerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7649,14 +11513,16 @@ else
 if eval "test \"\$ac_cv_func_hstrerror\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 7659 "configure"
+#line 11525 "configure"
 #include "confdefs.h"
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -7670,22 +11536,23 @@ hstrerror(17)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7673: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7676: \$? = $ac_status" >&5
+  echo "$as_me:11542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7678: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11545: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7681: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11548: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_hstrerror=\${ac_cv_funclib_hstrerror-no}"
 	LIBS="$ac_save_LIBS"
@@ -7699,14 +11566,14 @@ if false; then
 
 for ac_func in hstrerror
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:7703: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:11570: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7709 "configure"
+#line 11576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7737,29 +11604,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7743: \$? = $ac_status" >&5
+  echo "$as_me:11610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7745: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11613: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7748: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:11616: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7758: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:11626: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -7779,13 +11647,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:7782: result: yes" >&5
+	echo "$as_me:11650: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_hstrerror=no"
 	eval "LIB_hstrerror="
-	echo "$as_me:7788: result: no" >&5
+	echo "$as_me:11656: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -7799,7 +11667,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:7802: result: yes, in $ac_res" >&5
+	echo "$as_me:11670: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -7815,13 +11683,13 @@ fi
 if test "$ac_cv_func_hstrerror" = yes; then
 
 if test "$ac_cv_func_hstrerror+set" != set -o "$ac_cv_func_hstrerror" = yes; then
-echo "$as_me:7818: checking if hstrerror needs a prototype" >&5
+echo "$as_me:11686: checking if hstrerror needs a prototype" >&5
 echo $ECHO_N "checking if hstrerror needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_hstrerror_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7824 "configure"
+#line 11692 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_NETDB_H
@@ -7839,16 +11707,17 @@ hstrerror(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7842: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7845: \$? = $ac_status" >&5
+  echo "$as_me:11713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7847: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11716: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7850: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11719: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_hstrerror_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7857,7 +11726,7 @@ eval "ac_cv_func_hstrerror_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7860: result: $ac_cv_func_hstrerror_noproto" >&5
+echo "$as_me:11729: result: $ac_cv_func_hstrerror_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_hstrerror_noproto" >&6
 
 if test "$ac_cv_func_hstrerror_noproto" = yes; then
@@ -7875,13 +11744,13 @@ fi
 if test "$ac_cv_func_asprintf" = yes; then
 
 if test "$ac_cv_func_asprintf+set" != set -o "$ac_cv_func_asprintf" = yes; then
-echo "$as_me:7878: checking if asprintf needs a prototype" >&5
+echo "$as_me:11747: checking if asprintf needs a prototype" >&5
 echo $ECHO_N "checking if asprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_asprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7884 "configure"
+#line 11753 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7898,16 +11767,17 @@ asprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7904: \$? = $ac_status" >&5
+  echo "$as_me:11773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7906: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11776: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7909: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11779: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_asprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7916,7 +11786,7 @@ eval "ac_cv_func_asprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7919: result: $ac_cv_func_asprintf_noproto" >&5
+echo "$as_me:11789: result: $ac_cv_func_asprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_asprintf_noproto" >&6
 
 if test "$ac_cv_func_asprintf_noproto" = yes; then
@@ -7932,13 +11802,13 @@ fi
 if test "$ac_cv_func_vasprintf" = yes; then
 
 if test "$ac_cv_func_vasprintf+set" != set -o "$ac_cv_func_vasprintf" = yes; then
-echo "$as_me:7935: checking if vasprintf needs a prototype" >&5
+echo "$as_me:11805: checking if vasprintf needs a prototype" >&5
 echo $ECHO_N "checking if vasprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_vasprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7941 "configure"
+#line 11811 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -7955,16 +11825,17 @@ vasprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7961: \$? = $ac_status" >&5
+  echo "$as_me:11831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:7963: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11834: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7966: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11837: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_vasprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -7973,7 +11844,7 @@ eval "ac_cv_func_vasprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7976: result: $ac_cv_func_vasprintf_noproto" >&5
+echo "$as_me:11847: result: $ac_cv_func_vasprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf_noproto" >&6
 
 if test "$ac_cv_func_vasprintf_noproto" = yes; then
@@ -7989,13 +11860,13 @@ fi
 if test "$ac_cv_func_asnprintf" = yes; then
 
 if test "$ac_cv_func_asnprintf+set" != set -o "$ac_cv_func_asnprintf" = yes; then
-echo "$as_me:7992: checking if asnprintf needs a prototype" >&5
+echo "$as_me:11863: checking if asnprintf needs a prototype" >&5
 echo $ECHO_N "checking if asnprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_asnprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7998 "configure"
+#line 11869 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8012,16 +11883,17 @@ asnprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8018: \$? = $ac_status" >&5
+  echo "$as_me:11889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8020: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11892: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8023: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11895: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_asnprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8030,7 +11902,7 @@ eval "ac_cv_func_asnprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8033: result: $ac_cv_func_asnprintf_noproto" >&5
+echo "$as_me:11905: result: $ac_cv_func_asnprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_asnprintf_noproto" >&6
 
 if test "$ac_cv_func_asnprintf_noproto" = yes; then
@@ -8046,13 +11918,13 @@ fi
 if test "$ac_cv_func_vasnprintf" = yes; then
 
 if test "$ac_cv_func_vasnprintf+set" != set -o "$ac_cv_func_vasnprintf" = yes; then
-echo "$as_me:8049: checking if vasnprintf needs a prototype" >&5
+echo "$as_me:11921: checking if vasnprintf needs a prototype" >&5
 echo $ECHO_N "checking if vasnprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_vasnprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8055 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8069,16 +11941,17 @@ vasnprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8075: \$? = $ac_status" >&5
+  echo "$as_me:11947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8077: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11950: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8080: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:11953: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_vasnprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -8087,7 +11960,7 @@ eval "ac_cv_func_vasnprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8090: result: $ac_cv_func_vasnprintf_noproto" >&5
+echo "$as_me:11963: result: $ac_cv_func_vasnprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_vasnprintf_noproto" >&6
 
 if test "$ac_cv_func_vasnprintf_noproto" = yes; then
@@ -8101,7 +11974,343 @@ fi
 fi
 fi
 
-echo "$as_me:8104: checking for pidfile" >&5
+echo "$as_me:11977: checking for bswap16" >&5
+echo $ECHO_N "checking for bswap16... $ECHO_C" >&6
+if test "${ac_cv_funclib_bswap16+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_bswap16\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 11995 "configure"
+#include "confdefs.h"
+#ifdef HAVE_SYS_BSWAP_H
+#include <sys/bswap.h>
+#endif
+int
+main ()
+{
+bswap16(0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12009: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12012: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12015: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12018: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_bswap16=$ac_lib; else ac_cv_funclib_bswap16=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_bswap16=\${ac_cv_funclib_bswap16-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_bswap16"
+
+if false; then
+
+for ac_func in bswap16
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12040: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12046 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12077: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12080: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12083: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12086: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:12096: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# bswap16
+eval "ac_tr_func=HAVE_`echo bswap16 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_bswap16=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_bswap16=yes"
+	eval "LIB_bswap16="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:12120: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_bswap16=no"
+	eval "LIB_bswap16="
+	echo "$as_me:12126: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_bswap16=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:12140: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+echo "$as_me:12145: checking for bswap32" >&5
+echo $ECHO_N "checking for bswap32... $ECHO_C" >&6
+if test "${ac_cv_funclib_bswap32+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_bswap32\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 12163 "configure"
+#include "confdefs.h"
+#ifdef HAVE_SYS_BSWAP_H
+#include <sys/bswap.h>
+#endif
+int
+main ()
+{
+bswap32(0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12177: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12180: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12186: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_bswap32=$ac_lib; else ac_cv_funclib_bswap32=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_bswap32=\${ac_cv_funclib_bswap32-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_bswap32"
+
+if false; then
+
+for ac_func in bswap32
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12208: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12214 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12245: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12248: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12251: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12254: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:12264: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# bswap32
+eval "ac_tr_func=HAVE_`echo bswap32 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_bswap32=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_bswap32=yes"
+	eval "LIB_bswap32="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:12288: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_bswap32=no"
+	eval "LIB_bswap32="
+	echo "$as_me:12294: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_bswap32=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:12308: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+echo "$as_me:12313: checking for pidfile" >&5
 echo $ECHO_N "checking for pidfile... $ECHO_C" >&6
 if test "${ac_cv_funclib_pidfile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8110,14 +12319,16 @@ else
 if eval "test \"\$ac_cv_func_pidfile\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" util; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8120 "configure"
+#line 12331 "configure"
 #include "confdefs.h"
 #ifdef HAVE_UTIL_H
 #include <util.h>
@@ -8131,22 +12342,23 @@ pidfile(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8134: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8137: \$? = $ac_status" >&5
+  echo "$as_me:12348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8139: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12351: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8142: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:12354: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_pidfile=$ac_lib; else ac_cv_funclib_pidfile=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_pidfile=\${ac_cv_funclib_pidfile-no}"
 	LIBS="$ac_save_LIBS"
@@ -8160,14 +12372,14 @@ if false; then
 
 for ac_func in pidfile
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8164: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12376: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8170 "configure"
+#line 12382 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8198,29 +12410,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8204: \$? = $ac_status" >&5
+  echo "$as_me:12416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8206: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12419: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8209: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:12422: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8219: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:12432: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -8240,13 +12453,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:8243: result: yes" >&5
+	echo "$as_me:12456: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_pidfile=no"
 	eval "LIB_pidfile="
-	echo "$as_me:8249: result: no" >&5
+	echo "$as_me:12462: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -8260,24 +12473,729 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:8263: result: yes, in $ac_res" >&5
+	echo "$as_me:12476: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+echo "$as_me:12481: checking for getaddrinfo" >&5
+echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
+if test "${ac_cv_funclib_getaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_getaddrinfo\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 12499 "configure"
+#include "confdefs.h"
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+int
+main ()
+{
+getaddrinfo(0,0,0,0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12513: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12516: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12519: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12522: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getaddrinfo=$ac_lib; else ac_cv_funclib_getaddrinfo=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_getaddrinfo=\${ac_cv_funclib_getaddrinfo-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_getaddrinfo"
+
+if false; then
+
+for ac_func in getaddrinfo
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12544: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12550 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12581: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12584: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12587: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12590: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:12600: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# getaddrinfo
+eval "ac_tr_func=HAVE_`echo getaddrinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_getaddrinfo=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_getaddrinfo=yes"
+	eval "LIB_getaddrinfo="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:12624: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_getaddrinfo=no"
+	eval "LIB_getaddrinfo="
+	echo "$as_me:12630: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_getaddrinfo=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:12644: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_getaddrinfo"; then
+	LIBS="$LIB_getaddrinfo $LIBS"
+fi
+
+if eval "test \"$ac_cv_func_getaddrinfo\" != yes"; then
+LIBOBJS="$LIBOBJS getaddrinfo.o"
+fi
+
+echo "$as_me:12657: checking for getnameinfo" >&5
+echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
+if test "${ac_cv_funclib_getnameinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_getnameinfo\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 12675 "configure"
+#include "confdefs.h"
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+int
+main ()
+{
+getnameinfo(0,0,0,0,0,0,0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12689: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12692: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12695: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12698: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getnameinfo=$ac_lib; else ac_cv_funclib_getnameinfo=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_getnameinfo=\${ac_cv_funclib_getnameinfo-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_getnameinfo"
+
+if false; then
+
+for ac_func in getnameinfo
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12720: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12726 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12757: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12760: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12763: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12766: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:12776: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# getnameinfo
+eval "ac_tr_func=HAVE_`echo getnameinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_getnameinfo=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_getnameinfo=yes"
+	eval "LIB_getnameinfo="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:12800: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_getnameinfo=no"
+	eval "LIB_getnameinfo="
+	echo "$as_me:12806: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_getnameinfo=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:12820: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_getnameinfo"; then
+	LIBS="$LIB_getnameinfo $LIBS"
+fi
+
+if eval "test \"$ac_cv_func_getnameinfo\" != yes"; then
+LIBOBJS="$LIBOBJS getnameinfo.o"
+fi
+
+echo "$as_me:12833: checking for freeaddrinfo" >&5
+echo $ECHO_N "checking for freeaddrinfo... $ECHO_C" >&6
+if test "${ac_cv_funclib_freeaddrinfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_freeaddrinfo\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 12851 "configure"
+#include "confdefs.h"
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+int
+main ()
+{
+freeaddrinfo(0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12865: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12868: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12871: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12874: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_freeaddrinfo=$ac_lib; else ac_cv_funclib_freeaddrinfo=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_freeaddrinfo=\${ac_cv_funclib_freeaddrinfo-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_freeaddrinfo"
+
+if false; then
+
+for ac_func in freeaddrinfo
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:12896: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12902 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:12933: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:12936: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:12939: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12942: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:12952: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# freeaddrinfo
+eval "ac_tr_func=HAVE_`echo freeaddrinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_freeaddrinfo=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_freeaddrinfo=yes"
+	eval "LIB_freeaddrinfo="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:12976: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_freeaddrinfo=no"
+	eval "LIB_freeaddrinfo="
+	echo "$as_me:12982: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_freeaddrinfo=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:12996: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_freeaddrinfo"; then
+	LIBS="$LIB_freeaddrinfo $LIBS"
+fi
+
+if eval "test \"$ac_cv_func_freeaddrinfo\" != yes"; then
+LIBOBJS="$LIBOBJS freeaddrinfo.o"
+fi
+
+echo "$as_me:13009: checking for gai_strerror" >&5
+echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
+if test "${ac_cv_funclib_gai_strerror+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_gai_strerror\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" ; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 13027 "configure"
+#include "confdefs.h"
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+int
+main ()
+{
+gai_strerror(0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:13041: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:13044: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13047: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13050: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gai_strerror=$ac_lib; else ac_cv_funclib_gai_strerror=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_gai_strerror=\${ac_cv_funclib_gai_strerror-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_gai_strerror"
+
+if false; then
+
+for ac_func in gai_strerror
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13072: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 13078 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:13109: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:13112: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13115: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:13118: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:13128: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# gai_strerror
+eval "ac_tr_func=HAVE_`echo gai_strerror | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_gai_strerror=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_gai_strerror=yes"
+	eval "LIB_gai_strerror="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:13152: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_gai_strerror=no"
+	eval "LIB_gai_strerror="
+	echo "$as_me:13158: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_gai_strerror=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:13172: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
+if test -n "$LIB_gai_strerror"; then
+	LIBS="$LIB_gai_strerror $LIBS"
+fi
+
+if eval "test \"$ac_cv_func_gai_strerror\" != yes"; then
+LIBOBJS="$LIBOBJS gai_strerror.o"
+fi
+
 for ac_func in 					\
 	chown					\
 	copyhostent				\
 	daemon					\
+	ecalloc					\
+	emalloc					\
+	erealloc				\
+	estrdup					\
 	err					\
 	errx					\
 	fchown					\
 	flock					\
 	fnmatch					\
-	freeaddrinfo				\
 	freehostent				\
-	gai_strerror				\
-	getaddrinfo				\
 	getcwd					\
 	getdtablesize				\
 	getegid					\
@@ -8287,7 +13205,6 @@ for ac_func in 					\
 	getifaddrs				\
 	getipnodebyaddr				\
 	getipnodebyname				\
-	getnameinfo				\
 	getopt					\
 	gettimeofday				\
 	getuid					\
@@ -8333,14 +13250,14 @@ for ac_func in 					\
 	writev					\
 
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8337: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13254: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8343 "configure"
+#line 13260 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8371,27 +13288,28 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8377: \$? = $ac_status" >&5
+  echo "$as_me:13294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8379: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13297: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8382: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:13300: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8392: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:13310: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
 
 ac_tr_func=HAVE_`echo $ac_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
 cat >>confdefs.h <<EOF
@@ -8408,15 +13326,16 @@ for ac_func in \
 	chown					\
 	copyhostent				\
 	daemon					\
+	ecalloc					\
+	emalloc					\
+	erealloc				\
+	estrdup					\
 	err					\
 	errx					\
 	fchown					\
 	flock					\
 	fnmatch					\
-	freeaddrinfo				\
 	freehostent				\
-	gai_strerror				\
-	getaddrinfo				\
 	getcwd					\
 	getdtablesize				\
 	getegid					\
@@ -8426,7 +13345,6 @@ for ac_func in \
 	getifaddrs				\
 	getipnodebyaddr				\
 	getipnodebyname				\
-	getnameinfo				\
 	getopt					\
 	gettimeofday				\
 	getuid					\
@@ -8472,14 +13390,14 @@ for ac_func in \
 	writev					\
 
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8476: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13394: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8482 "configure"
+#line 13400 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8510,29 +13428,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8516: \$? = $ac_status" >&5
+  echo "$as_me:13434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8518: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13437: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8521: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:13440: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8531: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:13450: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -8543,13 +13462,13 @@ done
 
 for ac_func in inet_aton
 do
-echo "$as_me:8546: checking for $ac_func" >&5
+echo "$as_me:13465: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8552 "configure"
+#line 13471 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -8581,23 +13500,24 @@ $ac_func(0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8587: \$? = $ac_status" >&5
+  echo "$as_me:13506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8589: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13509: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8592: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:13512: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 eval "ac_cv_func_$ac_func=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
@@ -8606,10 +13526,10 @@ if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
 #define $ac_tr_func 1
 EOF
 
-  echo "$as_me:8609: result: yes" >&5
+  echo "$as_me:13529: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:8612: result: no" >&5
+  echo "$as_me:13532: result: no" >&5
 echo "${ECHO_T}no" >&6
   LIBOBJS="$LIBOBJS ${ac_func}.o"
 fi
@@ -8618,14 +13538,14 @@ if false; then
 
 for ac_func in inet_aton
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8622: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13542: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8628 "configure"
+#line 13548 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8656,29 +13576,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13579: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8662: \$? = $ac_status" >&5
+  echo "$as_me:13582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8664: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13585: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8667: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:13588: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8677: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:13598: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -8688,13 +13609,13 @@ fi
 
 for ac_func in inet_ntop
 do
-echo "$as_me:8691: checking for $ac_func" >&5
+echo "$as_me:13612: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8697 "configure"
+#line 13618 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -8726,23 +13647,24 @@ $ac_func(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8732: \$? = $ac_status" >&5
+  echo "$as_me:13653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8734: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13656: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8737: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:13659: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 eval "ac_cv_func_$ac_func=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
@@ -8751,10 +13673,10 @@ if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
 #define $ac_tr_func 1
 EOF
 
-  echo "$as_me:8754: result: yes" >&5
+  echo "$as_me:13676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:8757: result: no" >&5
+  echo "$as_me:13679: result: no" >&5
 echo "${ECHO_T}no" >&6
   LIBOBJS="$LIBOBJS ${ac_func}.o"
 fi
@@ -8763,14 +13685,14 @@ if false; then
 
 for ac_func in inet_ntop
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8767: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13689: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8773 "configure"
+#line 13695 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8801,29 +13723,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8807: \$? = $ac_status" >&5
+  echo "$as_me:13729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8809: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13732: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8812: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:13735: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8822: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:13745: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -8833,13 +13756,13 @@ fi
 
 for ac_func in inet_pton
 do
-echo "$as_me:8836: checking for $ac_func" >&5
+echo "$as_me:13759: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8842 "configure"
+#line 13765 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -8871,23 +13794,24 @@ $ac_func(0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8877: \$? = $ac_status" >&5
+  echo "$as_me:13800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8879: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13803: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8882: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:13806: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 eval "ac_cv_func_$ac_func=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
 if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
@@ -8896,10 +13820,10 @@ if eval "test \"\${ac_cv_func_$ac_func}\" = yes"; then
 #define $ac_tr_func 1
 EOF
 
-  echo "$as_me:8899: result: yes" >&5
+  echo "$as_me:13823: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:8902: result: no" >&5
+  echo "$as_me:13826: result: no" >&5
 echo "${ECHO_T}no" >&6
   LIBOBJS="$LIBOBJS ${ac_func}.o"
 fi
@@ -8908,14 +13832,14 @@ if false; then
 
 for ac_func in inet_pton
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:8912: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:13836: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8918 "configure"
+#line 13842 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8946,29 +13870,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8952: \$? = $ac_status" >&5
+  echo "$as_me:13876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:8954: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:13879: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8957: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:13882: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8967: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:13892: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -8976,14 +13901,14 @@ done
 
 fi
 
-echo "$as_me:8979: checking for sa_len in struct sockaddr" >&5
+echo "$as_me:13904: checking for sa_len in struct sockaddr" >&5
 echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8986 "configure"
+#line 13911 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -8996,16 +13921,17 @@ struct sockaddr x; x.sa_len;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9002: \$? = $ac_status" >&5
+  echo "$as_me:13927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9004: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:13930: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9007: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:13933: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr_sa_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -9014,7 +13940,7 @@ ac_cv_type_struct_sockaddr_sa_len=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9017: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+echo "$as_me:13943: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
 if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
 
@@ -9026,18 +13952,18 @@ fi
 
 if test "$ac_cv_func_getnameinfo" = "yes"; then
 
-echo "$as_me:9029: checking if getnameinfo is broken" >&5
+echo "$as_me:13955: checking if getnameinfo is broken" >&5
 echo $ECHO_N "checking if getnameinfo is broken... $ECHO_C" >&6
 if test "${ac_cv_func_getnameinfo_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9035: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13961: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9040 "configure"
+#line 13966 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -9063,15 +13989,16 @@ main(int argc, char **argv)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9069: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:9070: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:13995: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:13997: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9073: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14000: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_getnameinfo_broken=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -9079,24 +14006,86 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_getnameinfo_broken=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:9085: result: $ac_cv_func_getnameinfo_broken" >&5
+echo "$as_me:14012: result: $ac_cv_func_getnameinfo_broken" >&5
 echo "${ECHO_T}$ac_cv_func_getnameinfo_broken" >&6
   if test "$ac_cv_func_getnameinfo_broken" = yes; then
     LIBOBJS="$LIBOBJS getnameinfo.o"
   fi
 fi
 
+if test "$ac_cv_func_getaddrinfo" = "yes"; then
+
+echo "$as_me:14021: checking if getaddrinfo handles numeric services" >&5
+echo $ECHO_N "checking if getaddrinfo handles numeric services... $ECHO_C" >&6
+if test "${ac_cv_func_getaddrinfo_numserv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:14027: error: cannot run test program while cross compiling" >&5
+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 14032 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
+int
+main(int argc, char **argv)
+{
+	struct addrinfo hints, *ai;
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_flags = AI_PASSIVE;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_family = PF_UNSPEC;
+	if(getaddrinfo(NULL, "17", &hints, &ai) == EAI_SERVICE)
+		return 1;
+	return 0;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:14054: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:14057: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:14059: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:14062: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_getaddrinfo_numserv=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_getaddrinfo_numserv=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:14074: result: $ac_cv_func_getaddrinfo_numserv" >&5
+echo "${ECHO_T}$ac_cv_func_getaddrinfo_numserv" >&6
+  if test "$ac_cv_func_getaddrinfo_numserv" = no; then
+    LIBOBJS="$LIBOBJS getaddrinfo.o"
+  fi
+fi
+
 if test "$ac_cv_func_setenv+set" != set -o "$ac_cv_func_setenv" = yes; then
-echo "$as_me:9093: checking if setenv needs a prototype" >&5
+echo "$as_me:14082: checking if setenv needs a prototype" >&5
 echo $ECHO_N "checking if setenv needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_setenv_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9099 "configure"
+#line 14088 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9111,16 +14100,17 @@ setenv(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9117: \$? = $ac_status" >&5
+  echo "$as_me:14106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9119: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14109: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9122: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14112: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_setenv_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9129,7 +14119,7 @@ eval "ac_cv_func_setenv_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9132: result: $ac_cv_func_setenv_noproto" >&5
+echo "$as_me:14122: result: $ac_cv_func_setenv_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_setenv_noproto" >&6
 
 if test "$ac_cv_func_setenv_noproto" = yes; then
@@ -9143,13 +14133,13 @@ fi
 fi
 
 if test "$ac_cv_func_unsetenv+set" != set -o "$ac_cv_func_unsetenv" = yes; then
-echo "$as_me:9146: checking if unsetenv needs a prototype" >&5
+echo "$as_me:14136: checking if unsetenv needs a prototype" >&5
 echo $ECHO_N "checking if unsetenv needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_unsetenv_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9152 "configure"
+#line 14142 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9164,16 +14154,17 @@ unsetenv(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9170: \$? = $ac_status" >&5
+  echo "$as_me:14160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9172: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14163: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9175: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14166: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_unsetenv_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9182,7 +14173,7 @@ eval "ac_cv_func_unsetenv_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9185: result: $ac_cv_func_unsetenv_noproto" >&5
+echo "$as_me:14176: result: $ac_cv_func_unsetenv_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_unsetenv_noproto" >&6
 
 if test "$ac_cv_func_unsetenv_noproto" = yes; then
@@ -9196,13 +14187,13 @@ fi
 fi
 
 if test "$ac_cv_func_gethostname+set" != set -o "$ac_cv_func_gethostname" = yes; then
-echo "$as_me:9199: checking if gethostname needs a prototype" >&5
+echo "$as_me:14190: checking if gethostname needs a prototype" >&5
 echo $ECHO_N "checking if gethostname needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_gethostname_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9205 "configure"
+#line 14196 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int
@@ -9217,16 +14208,17 @@ gethostname(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9223: \$? = $ac_status" >&5
+  echo "$as_me:14214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9225: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14217: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9228: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14220: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_gethostname_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9235,7 +14227,7 @@ eval "ac_cv_func_gethostname_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9238: result: $ac_cv_func_gethostname_noproto" >&5
+echo "$as_me:14230: result: $ac_cv_func_gethostname_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_gethostname_noproto" >&6
 
 if test "$ac_cv_func_gethostname_noproto" = yes; then
@@ -9249,13 +14241,13 @@ fi
 fi
 
 if test "$ac_cv_func_mkstemp+set" != set -o "$ac_cv_func_mkstemp" = yes; then
-echo "$as_me:9252: checking if mkstemp needs a prototype" >&5
+echo "$as_me:14244: checking if mkstemp needs a prototype" >&5
 echo $ECHO_N "checking if mkstemp needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_mkstemp_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9258 "configure"
+#line 14250 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int
@@ -9270,16 +14262,17 @@ mkstemp(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9276: \$? = $ac_status" >&5
+  echo "$as_me:14268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9278: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14271: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9281: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14274: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_mkstemp_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9288,7 +14281,7 @@ eval "ac_cv_func_mkstemp_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9291: result: $ac_cv_func_mkstemp_noproto" >&5
+echo "$as_me:14284: result: $ac_cv_func_mkstemp_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_mkstemp_noproto" >&6
 
 if test "$ac_cv_func_mkstemp_noproto" = yes; then
@@ -9302,13 +14295,13 @@ fi
 fi
 
 if test "$ac_cv_func_getusershell+set" != set -o "$ac_cv_func_getusershell" = yes; then
-echo "$as_me:9305: checking if getusershell needs a prototype" >&5
+echo "$as_me:14298: checking if getusershell needs a prototype" >&5
 echo $ECHO_N "checking if getusershell needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_getusershell_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9311 "configure"
+#line 14304 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int
@@ -9323,16 +14316,17 @@ getusershell(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9326: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9329: \$? = $ac_status" >&5
+  echo "$as_me:14322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9331: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14325: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9334: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14328: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_getusershell_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9341,7 +14335,7 @@ eval "ac_cv_func_getusershell_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9344: result: $ac_cv_func_getusershell_noproto" >&5
+echo "$as_me:14338: result: $ac_cv_func_getusershell_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_getusershell_noproto" >&6
 
 if test "$ac_cv_func_getusershell_noproto" = yes; then
@@ -9355,13 +14349,13 @@ fi
 fi
 
 if test "$ac_cv_func_inet_aton+set" != set -o "$ac_cv_func_inet_aton" = yes; then
-echo "$as_me:9358: checking if inet_aton needs a prototype" >&5
+echo "$as_me:14352: checking if inet_aton needs a prototype" >&5
 echo $ECHO_N "checking if inet_aton needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_inet_aton_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9364 "configure"
+#line 14358 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9388,16 +14382,17 @@ inet_aton(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9394: \$? = $ac_status" >&5
+  echo "$as_me:14388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9396: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14391: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9399: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14394: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_inet_aton_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9406,7 +14401,7 @@ eval "ac_cv_func_inet_aton_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9409: result: $ac_cv_func_inet_aton_noproto" >&5
+echo "$as_me:14404: result: $ac_cv_func_inet_aton_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_inet_aton_noproto" >&6
 
 if test "$ac_cv_func_inet_aton_noproto" = yes; then
@@ -9419,7 +14414,7 @@ fi
 
 fi
 
-echo "$as_me:9422: checking for crypt" >&5
+echo "$as_me:14417: checking for crypt" >&5
 echo $ECHO_N "checking for crypt... $ECHO_C" >&6
 if test "${ac_cv_funclib_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9428,14 +14423,16 @@ else
 if eval "test \"\$ac_cv_func_crypt\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" crypt; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9438 "configure"
+#line 14435 "configure"
 #include "confdefs.h"
 
 int
@@ -9447,22 +14444,23 @@ crypt()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9453: \$? = $ac_status" >&5
+  echo "$as_me:14450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9455: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:14453: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9458: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14456: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
 	LIBS="$ac_save_LIBS"
@@ -9476,14 +14474,14 @@ if false; then
 
 for ac_func in crypt
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:9480: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:14478: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9486 "configure"
+#line 14484 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -9514,29 +14512,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14515: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9520: \$? = $ac_status" >&5
+  echo "$as_me:14518: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9522: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:14521: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9525: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:14524: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:9535: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:14534: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -9556,13 +14555,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:9559: result: yes" >&5
+	echo "$as_me:14558: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_crypt=no"
 	eval "LIB_crypt="
-	echo "$as_me:9565: result: no" >&5
+	echo "$as_me:14564: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -9576,18 +14575,18 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:9579: result: yes, in $ac_res" >&5
+	echo "$as_me:14578: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:9584: checking if gethostbyname is compatible with system prototype" >&5
+echo "$as_me:14583: checking if gethostbyname is compatible with system prototype" >&5
 echo $ECHO_N "checking if gethostbyname is compatible with system prototype... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname_proto_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9590 "configure"
+#line 14589 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9615,16 +14614,17 @@ struct hostent *gethostbyname(const char *);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14617: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9621: \$? = $ac_status" >&5
+  echo "$as_me:14620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9623: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14623: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9626: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14626: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_gethostbyname_proto_compat=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9633,7 +14633,7 @@ eval "ac_cv_func_gethostbyname_proto_compat=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9636: result: $ac_cv_func_gethostbyname_proto_compat" >&5
+echo "$as_me:14636: result: $ac_cv_func_gethostbyname_proto_compat" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname_proto_compat" >&6
 
 if test "$ac_cv_func_gethostbyname_proto_compat" = yes; then
@@ -9644,13 +14644,13 @@ EOF
 
 fi
 
-echo "$as_me:9647: checking if gethostbyaddr is compatible with system prototype" >&5
+echo "$as_me:14647: checking if gethostbyaddr is compatible with system prototype" >&5
 echo $ECHO_N "checking if gethostbyaddr is compatible with system prototype... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyaddr_proto_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9653 "configure"
+#line 14653 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9678,16 +14678,17 @@ struct hostent *gethostbyaddr(const void *, size_t, int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9684: \$? = $ac_status" >&5
+  echo "$as_me:14684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9686: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9689: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14690: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_gethostbyaddr_proto_compat=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9696,7 +14697,7 @@ eval "ac_cv_func_gethostbyaddr_proto_compat=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9699: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
+echo "$as_me:14700: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyaddr_proto_compat" >&6
 
 if test "$ac_cv_func_gethostbyaddr_proto_compat" = yes; then
@@ -9707,13 +14708,13 @@ EOF
 
 fi
 
-echo "$as_me:9710: checking if getservbyname is compatible with system prototype" >&5
+echo "$as_me:14711: checking if getservbyname is compatible with system prototype" >&5
 echo $ECHO_N "checking if getservbyname is compatible with system prototype... $ECHO_C" >&6
 if test "${ac_cv_func_getservbyname_proto_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9716 "configure"
+#line 14717 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9741,16 +14742,17 @@ struct servent *getservbyname(const char *, const char *);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9747: \$? = $ac_status" >&5
+  echo "$as_me:14748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9749: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14751: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9752: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14754: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_getservbyname_proto_compat=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9759,7 +14761,7 @@ eval "ac_cv_func_getservbyname_proto_compat=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9762: result: $ac_cv_func_getservbyname_proto_compat" >&5
+echo "$as_me:14764: result: $ac_cv_func_getservbyname_proto_compat" >&5
 echo "${ECHO_T}$ac_cv_func_getservbyname_proto_compat" >&6
 
 if test "$ac_cv_func_getservbyname_proto_compat" = yes; then
@@ -9770,13 +14772,13 @@ EOF
 
 fi
 
-echo "$as_me:9773: checking if getsockname is compatible with system prototype" >&5
+echo "$as_me:14775: checking if getsockname is compatible with system prototype" >&5
 echo $ECHO_N "checking if getsockname is compatible with system prototype... $ECHO_C" >&6
 if test "${ac_cv_func_getsockname_proto_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9779 "configure"
+#line 14781 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9795,16 +14797,17 @@ int getsockname(int, struct sockaddr*, socklen_t*);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9801: \$? = $ac_status" >&5
+  echo "$as_me:14803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9803: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14806: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9806: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14809: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_getsockname_proto_compat=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9813,7 +14816,7 @@ eval "ac_cv_func_getsockname_proto_compat=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9816: result: $ac_cv_func_getsockname_proto_compat" >&5
+echo "$as_me:14819: result: $ac_cv_func_getsockname_proto_compat" >&5
 echo "${ECHO_T}$ac_cv_func_getsockname_proto_compat" >&6
 
 if test "$ac_cv_func_getsockname_proto_compat" = yes; then
@@ -9824,13 +14827,13 @@ EOF
 
 fi
 
-echo "$as_me:9827: checking if openlog is compatible with system prototype" >&5
+echo "$as_me:14830: checking if openlog is compatible with system prototype" >&5
 echo $ECHO_N "checking if openlog is compatible with system prototype... $ECHO_C" >&6
 if test "${ac_cv_func_openlog_proto_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9833 "configure"
+#line 14836 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYSLOG_H
@@ -9846,16 +14849,17 @@ void openlog(const char *, int, int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9852: \$? = $ac_status" >&5
+  echo "$as_me:14855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9854: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14858: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9857: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14861: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_openlog_proto_compat=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9864,7 +14868,7 @@ eval "ac_cv_func_openlog_proto_compat=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9867: result: $ac_cv_func_openlog_proto_compat" >&5
+echo "$as_me:14871: result: $ac_cv_func_openlog_proto_compat" >&5
 echo "${ECHO_T}$ac_cv_func_openlog_proto_compat" >&6
 
 if test "$ac_cv_func_openlog_proto_compat" = yes; then
@@ -9876,13 +14880,13 @@ EOF
 fi
 
 if test "$ac_cv_func_crypt+set" != set -o "$ac_cv_func_crypt" = yes; then
-echo "$as_me:9879: checking if crypt needs a prototype" >&5
+echo "$as_me:14883: checking if crypt needs a prototype" >&5
 echo $ECHO_N "checking if crypt needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_crypt_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9885 "configure"
+#line 14889 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_CRYPT_H
@@ -9904,16 +14908,17 @@ crypt(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9910: \$? = $ac_status" >&5
+  echo "$as_me:14914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9912: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14917: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9915: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14920: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_crypt_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9922,7 +14927,7 @@ eval "ac_cv_func_crypt_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9925: result: $ac_cv_func_crypt_noproto" >&5
+echo "$as_me:14930: result: $ac_cv_func_crypt_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_crypt_noproto" >&6
 
 if test "$ac_cv_func_crypt_noproto" = yes; then
@@ -9936,13 +14941,13 @@ fi
 fi
 
 if test "$ac_cv_func_strtok_r+set" != set -o "$ac_cv_func_strtok_r" = yes; then
-echo "$as_me:9939: checking if strtok_r needs a prototype" >&5
+echo "$as_me:14944: checking if strtok_r needs a prototype" >&5
 echo $ECHO_N "checking if strtok_r needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_strtok_r_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9945 "configure"
+#line 14950 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -9959,16 +14964,17 @@ strtok_r(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14967: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9965: \$? = $ac_status" >&5
+  echo "$as_me:14970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:9967: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:14973: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9970: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:14976: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_strtok_r_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -9977,7 +14983,7 @@ eval "ac_cv_func_strtok_r_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9980: result: $ac_cv_func_strtok_r_noproto" >&5
+echo "$as_me:14986: result: $ac_cv_func_strtok_r_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_strtok_r_noproto" >&6
 
 if test "$ac_cv_func_strtok_r_noproto" = yes; then
@@ -9991,13 +14997,13 @@ fi
 fi
 
 if test "$ac_cv_func_strsep+set" != set -o "$ac_cv_func_strsep" = yes; then
-echo "$as_me:9994: checking if strsep needs a prototype" >&5
+echo "$as_me:15000: checking if strsep needs a prototype" >&5
 echo $ECHO_N "checking if strsep needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_strsep_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10000 "configure"
+#line 15006 "configure"
 #include "confdefs.h"
 
 #include <string.h>
@@ -10014,16 +15020,17 @@ strsep(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10020: \$? = $ac_status" >&5
+  echo "$as_me:15026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10022: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15029: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15032: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_strsep_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -10032,7 +15039,7 @@ eval "ac_cv_func_strsep_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10035: result: $ac_cv_func_strsep_noproto" >&5
+echo "$as_me:15042: result: $ac_cv_func_strsep_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_strsep_noproto" >&6
 
 if test "$ac_cv_func_strsep_noproto" = yes; then
@@ -10045,14 +15052,14 @@ fi
 
 fi
 
-echo "$as_me:10048: checking for h_errno" >&5
+echo "$as_me:15055: checking for h_errno" >&5
 echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
 if test "${ac_cv_var_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10055 "configure"
+#line 15062 "configure"
 #include "confdefs.h"
 extern int h_errno;
 int foo() { return h_errno; }
@@ -10065,28 +15072,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15075: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10071: \$? = $ac_status" >&5
+  echo "$as_me:15078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10073: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15081: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10076: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15084: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var_h_errno=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var_h_errno=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var_h_errno`
-echo "$as_me:10089: result: $ac_foo" >&5
+echo "$as_me:15097: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -10094,14 +15102,14 @@ cat >>confdefs.h <<EOF
 #define HAVE_H_ERRNO 1
 EOF
 
-echo "$as_me:10097: checking if h_errno is properly declared" >&5
+echo "$as_me:15105: checking if h_errno is properly declared" >&5
 echo $ECHO_N "checking if h_errno is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_h_errno_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10104 "configure"
+#line 15112 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -10119,16 +15127,17 @@ h_errno.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10125: \$? = $ac_status" >&5
+  echo "$as_me:15133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10127: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15136: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10130: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15139: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_h_errno_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10139,7 +15148,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10142: result: $ac_cv_var_h_errno_declaration" >&5
+echo "$as_me:15151: result: $ac_cv_var_h_errno_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_h_errno_declaration" >&6
 if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
 
@@ -10151,14 +15160,14 @@ fi
 
 fi
 
-echo "$as_me:10154: checking for h_errlist" >&5
+echo "$as_me:15163: checking for h_errlist" >&5
 echo $ECHO_N "checking for h_errlist... $ECHO_C" >&6
 if test "${ac_cv_var_h_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10161 "configure"
+#line 15170 "configure"
 #include "confdefs.h"
 extern int h_errlist;
 int foo() { return h_errlist; }
@@ -10171,28 +15180,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10177: \$? = $ac_status" >&5
+  echo "$as_me:15186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10179: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15189: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10182: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15192: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var_h_errlist=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var_h_errlist=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var_h_errlist`
-echo "$as_me:10195: result: $ac_foo" >&5
+echo "$as_me:15205: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -10200,14 +15210,14 @@ cat >>confdefs.h <<EOF
 #define HAVE_H_ERRLIST 1
 EOF
 
-echo "$as_me:10203: checking if h_errlist is properly declared" >&5
+echo "$as_me:15213: checking if h_errlist is properly declared" >&5
 echo $ECHO_N "checking if h_errlist is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_h_errlist_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10210 "configure"
+#line 15220 "configure"
 #include "confdefs.h"
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -10222,16 +15232,17 @@ h_errlist.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10228: \$? = $ac_status" >&5
+  echo "$as_me:15238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10230: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15241: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10233: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15244: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_h_errlist_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10242,7 +15253,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10245: result: $ac_cv_var_h_errlist_declaration" >&5
+echo "$as_me:15256: result: $ac_cv_var_h_errlist_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_h_errlist_declaration" >&6
 if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
 
@@ -10254,14 +15265,14 @@ fi
 
 fi
 
-echo "$as_me:10257: checking for h_nerr" >&5
+echo "$as_me:15268: checking for h_nerr" >&5
 echo $ECHO_N "checking for h_nerr... $ECHO_C" >&6
 if test "${ac_cv_var_h_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10264 "configure"
+#line 15275 "configure"
 #include "confdefs.h"
 extern int h_nerr;
 int foo() { return h_nerr; }
@@ -10274,28 +15285,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15288: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10280: \$? = $ac_status" >&5
+  echo "$as_me:15291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10282: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15294: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10285: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15297: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var_h_nerr=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var_h_nerr=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var_h_nerr`
-echo "$as_me:10298: result: $ac_foo" >&5
+echo "$as_me:15310: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -10303,14 +15315,14 @@ cat >>confdefs.h <<EOF
 #define HAVE_H_NERR 1
 EOF
 
-echo "$as_me:10306: checking if h_nerr is properly declared" >&5
+echo "$as_me:15318: checking if h_nerr is properly declared" >&5
 echo $ECHO_N "checking if h_nerr is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_h_nerr_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10313 "configure"
+#line 15325 "configure"
 #include "confdefs.h"
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -10325,16 +15337,17 @@ h_nerr.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15340: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10331: \$? = $ac_status" >&5
+  echo "$as_me:15343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10333: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15346: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10336: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15349: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_h_nerr_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10345,7 +15358,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10348: result: $ac_cv_var_h_nerr_declaration" >&5
+echo "$as_me:15361: result: $ac_cv_var_h_nerr_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_h_nerr_declaration" >&6
 if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
 
@@ -10357,14 +15370,14 @@ fi
 
 fi
 
-echo "$as_me:10360: checking for __progname" >&5
+echo "$as_me:15373: checking for __progname" >&5
 echo $ECHO_N "checking for __progname... $ECHO_C" >&6
 if test "${ac_cv_var___progname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10367 "configure"
+#line 15380 "configure"
 #include "confdefs.h"
 extern int __progname;
 int foo() { return __progname; }
@@ -10377,28 +15390,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10383: \$? = $ac_status" >&5
+  echo "$as_me:15396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10385: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15399: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10388: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15402: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var___progname=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var___progname=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var___progname`
-echo "$as_me:10401: result: $ac_foo" >&5
+echo "$as_me:15415: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -10406,14 +15420,14 @@ cat >>confdefs.h <<EOF
 #define HAVE___PROGNAME 1
 EOF
 
-echo "$as_me:10409: checking if __progname is properly declared" >&5
+echo "$as_me:15423: checking if __progname is properly declared" >&5
 echo $ECHO_N "checking if __progname is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var___progname_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10416 "configure"
+#line 15430 "configure"
 #include "confdefs.h"
 #ifdef HAVE_ERR_H
 #include <err.h>
@@ -10428,16 +15442,17 @@ __progname.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10434: \$? = $ac_status" >&5
+  echo "$as_me:15448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10436: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15451: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10439: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15454: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var___progname_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10448,7 +15463,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10451: result: $ac_cv_var___progname_declaration" >&5
+echo "$as_me:15466: result: $ac_cv_var___progname_declaration" >&5
 echo "${ECHO_T}$ac_cv_var___progname_declaration" >&6
 if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
 
@@ -10460,14 +15475,14 @@ fi
 
 fi
 
-echo "$as_me:10463: checking if optarg is properly declared" >&5
+echo "$as_me:15478: checking if optarg is properly declared" >&5
 echo $ECHO_N "checking if optarg is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_optarg_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10470 "configure"
+#line 15485 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -10483,16 +15498,17 @@ optarg.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10489: \$? = $ac_status" >&5
+  echo "$as_me:15504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10491: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15507: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10494: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15510: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_optarg_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10503,7 +15519,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10506: result: $ac_cv_var_optarg_declaration" >&5
+echo "$as_me:15522: result: $ac_cv_var_optarg_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_optarg_declaration" >&6
 if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
 
@@ -10513,14 +15529,14 @@ EOF
 
 fi
 
-echo "$as_me:10516: checking if optind is properly declared" >&5
+echo "$as_me:15532: checking if optind is properly declared" >&5
 echo $ECHO_N "checking if optind is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_optind_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10523 "configure"
+#line 15539 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -10536,16 +15552,17 @@ optind.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10542: \$? = $ac_status" >&5
+  echo "$as_me:15558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10544: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15561: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10547: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15564: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_optind_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10556,7 +15573,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10559: result: $ac_cv_var_optind_declaration" >&5
+echo "$as_me:15576: result: $ac_cv_var_optind_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_optind_declaration" >&6
 if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
 
@@ -10566,14 +15583,14 @@ EOF
 
 fi
 
-echo "$as_me:10569: checking if opterr is properly declared" >&5
+echo "$as_me:15586: checking if opterr is properly declared" >&5
 echo $ECHO_N "checking if opterr is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_opterr_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10576 "configure"
+#line 15593 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -10589,16 +15606,17 @@ opterr.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10595: \$? = $ac_status" >&5
+  echo "$as_me:15612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10597: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10600: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15618: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_opterr_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10609,7 +15627,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10612: result: $ac_cv_var_opterr_declaration" >&5
+echo "$as_me:15630: result: $ac_cv_var_opterr_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_opterr_declaration" >&6
 if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
 
@@ -10619,14 +15637,14 @@ EOF
 
 fi
 
-echo "$as_me:10622: checking if optopt is properly declared" >&5
+echo "$as_me:15640: checking if optopt is properly declared" >&5
 echo $ECHO_N "checking if optopt is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_optopt_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10629 "configure"
+#line 15647 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -10642,16 +15660,17 @@ optopt.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15663: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10648: \$? = $ac_status" >&5
+  echo "$as_me:15666: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10650: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10653: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15672: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_optopt_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10662,7 +15681,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10665: result: $ac_cv_var_optopt_declaration" >&5
+echo "$as_me:15684: result: $ac_cv_var_optopt_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_optopt_declaration" >&6
 if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
 
@@ -10672,14 +15691,14 @@ EOF
 
 fi
 
-echo "$as_me:10675: checking if environ is properly declared" >&5
+echo "$as_me:15694: checking if environ is properly declared" >&5
 echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_environ_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10682 "configure"
+#line 15701 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 extern struct { int foo; } environ;
@@ -10692,16 +15711,17 @@ environ.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10698: \$? = $ac_status" >&5
+  echo "$as_me:15717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10700: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15720: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10703: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15723: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_environ_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10712,7 +15732,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10715: result: $ac_cv_var_environ_declaration" >&5
+echo "$as_me:15735: result: $ac_cv_var_environ_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_environ_declaration" >&6
 if eval "test \"\$ac_cv_var_environ_declaration\" = yes"; then
 
@@ -10722,14 +15742,14 @@ EOF
 
 fi
 
-echo "$as_me:10725: checking for tm_gmtoff in struct tm" >&5
+echo "$as_me:15745: checking for tm_gmtoff in struct tm" >&5
 echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
 if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10732 "configure"
+#line 15752 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -10741,16 +15761,17 @@ struct tm x; x.tm_gmtoff;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10747: \$? = $ac_status" >&5
+  echo "$as_me:15767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10749: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15770: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10752: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15773: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_tm_tm_gmtoff=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10759,7 +15780,7 @@ ac_cv_type_struct_tm_tm_gmtoff=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10762: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+echo "$as_me:15783: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
 echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
 if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
 
@@ -10769,14 +15790,14 @@ EOF
 
 fi
 
-echo "$as_me:10772: checking for tm_zone in struct tm" >&5
+echo "$as_me:15793: checking for tm_zone in struct tm" >&5
 echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
 if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10779 "configure"
+#line 15800 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -10788,16 +15809,17 @@ struct tm x; x.tm_zone;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10794: \$? = $ac_status" >&5
+  echo "$as_me:15815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10796: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15818: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10799: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15821: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_tm_tm_zone=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -10806,7 +15828,7 @@ ac_cv_type_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10809: result: $ac_cv_type_struct_tm_tm_zone" >&5
+echo "$as_me:15831: result: $ac_cv_type_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
 if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
 
@@ -10816,14 +15838,14 @@ EOF
 
 fi
 
-echo "$as_me:10819: checking for timezone" >&5
+echo "$as_me:15841: checking for timezone" >&5
 echo $ECHO_N "checking for timezone... $ECHO_C" >&6
 if test "${ac_cv_var_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10826 "configure"
+#line 15848 "configure"
 #include "confdefs.h"
 extern int timezone;
 int foo() { return timezone; }
@@ -10836,28 +15858,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10842: \$? = $ac_status" >&5
+  echo "$as_me:15864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10844: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15867: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10847: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15870: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var_timezone=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var_timezone=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var_timezone`
-echo "$as_me:10860: result: $ac_foo" >&5
+echo "$as_me:15883: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -10865,14 +15888,14 @@ cat >>confdefs.h <<EOF
 #define HAVE_TIMEZONE 1
 EOF
 
-echo "$as_me:10868: checking if timezone is properly declared" >&5
+echo "$as_me:15891: checking if timezone is properly declared" >&5
 echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_timezone_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10875 "configure"
+#line 15898 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern struct { int foo; } timezone;
@@ -10885,16 +15908,17 @@ timezone.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10891: \$? = $ac_status" >&5
+  echo "$as_me:15914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10893: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15917: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10896: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15920: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_timezone_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -10905,7 +15929,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:10908: result: $ac_cv_var_timezone_declaration" >&5
+echo "$as_me:15932: result: $ac_cv_var_timezone_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
 if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
 
@@ -10918,13 +15942,13 @@ fi
 fi
 
 cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-echo "$as_me:10921: checking for sa_family_t" >&5
+echo "$as_me:15945: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10927 "configure"
+#line 15951 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -10941,16 +15965,17 @@ sa_family_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10947: \$? = $ac_status" >&5
+  echo "$as_me:15971: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10949: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15974: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10952: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:15977: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -10960,18 +15985,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:10963: result: $ac_foo" >&5
+echo "$as_me:15988: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:10968: checking for sa_family_t" >&5
+	echo "$as_me:15993: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if test "${ac_cv_type_sa_family_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10974 "configure"
+#line 15999 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10986,16 +16011,17 @@ if (sizeof (sa_family_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10992: \$? = $ac_status" >&5
+  echo "$as_me:16017: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:10994: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16020: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10997: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16023: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_sa_family_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11004,7 +16030,7 @@ ac_cv_type_sa_family_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11007: result: $ac_cv_type_sa_family_t" >&5
+echo "$as_me:16033: result: $ac_cv_type_sa_family_t" >&5
 echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
 if test $ac_cv_type_sa_family_t = yes; then
 
@@ -11023,13 +16049,13 @@ EOF
 fi
 
 cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
-echo "$as_me:11026: checking for socklen_t" >&5
+echo "$as_me:16052: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11032 "configure"
+#line 16058 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -11046,16 +16072,17 @@ socklen_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11052: \$? = $ac_status" >&5
+  echo "$as_me:16078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11054: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16081: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11057: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16084: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11065,18 +16092,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:11068: result: $ac_foo" >&5
+echo "$as_me:16095: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:11073: checking for socklen_t" >&5
+	echo "$as_me:16100: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11079 "configure"
+#line 16106 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11091,16 +16118,17 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11097: \$? = $ac_status" >&5
+  echo "$as_me:16124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11099: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16127: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11102: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16130: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11109,7 +16137,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11112: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:16140: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
 
@@ -11128,13 +16156,13 @@ EOF
 fi
 
 cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
-echo "$as_me:11131: checking for struct sockaddr" >&5
+echo "$as_me:16159: checking for struct sockaddr" >&5
 echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11137 "configure"
+#line 16165 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -11151,16 +16179,17 @@ struct sockaddr foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11157: \$? = $ac_status" >&5
+  echo "$as_me:16185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11159: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16188: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11162: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16191: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11170,18 +16199,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:11173: result: $ac_foo" >&5
+echo "$as_me:16202: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:11178: checking for struct sockaddr" >&5
+	echo "$as_me:16207: checking for struct sockaddr" >&5
 echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11184 "configure"
+#line 16213 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11196,16 +16225,17 @@ if (sizeof (struct sockaddr))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11202: \$? = $ac_status" >&5
+  echo "$as_me:16231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11204: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16234: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11207: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16237: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11214,7 +16244,7 @@ ac_cv_type_struct_sockaddr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11217: result: $ac_cv_type_struct_sockaddr" >&5
+echo "$as_me:16247: result: $ac_cv_type_struct_sockaddr" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
 if test $ac_cv_type_struct_sockaddr = yes; then
 
@@ -11233,13 +16263,13 @@ EOF
 fi
 
 cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
-echo "$as_me:11236: checking for struct sockaddr_storage" >&5
+echo "$as_me:16266: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11242 "configure"
+#line 16272 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -11256,16 +16286,17 @@ struct sockaddr_storage foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16289: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11262: \$? = $ac_status" >&5
+  echo "$as_me:16292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11264: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16295: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11267: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16298: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11275,18 +16306,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:11278: result: $ac_foo" >&5
+echo "$as_me:16309: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:11283: checking for struct sockaddr_storage" >&5
+	echo "$as_me:16314: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11289 "configure"
+#line 16320 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11301,16 +16332,17 @@ if (sizeof (struct sockaddr_storage))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16335: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11307: \$? = $ac_status" >&5
+  echo "$as_me:16338: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11309: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11312: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16344: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr_storage=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11319,7 +16351,7 @@ ac_cv_type_struct_sockaddr_storage=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11322: result: $ac_cv_type_struct_sockaddr_storage" >&5
+echo "$as_me:16354: result: $ac_cv_type_struct_sockaddr_storage" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
 if test $ac_cv_type_struct_sockaddr_storage = yes; then
 
@@ -11338,13 +16370,13 @@ EOF
 fi
 
 cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
-echo "$as_me:11341: checking for struct addrinfo" >&5
+echo "$as_me:16373: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11347 "configure"
+#line 16379 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -11361,16 +16393,17 @@ struct addrinfo foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11367: \$? = $ac_status" >&5
+  echo "$as_me:16399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11369: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16402: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11372: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16405: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11380,18 +16413,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:11383: result: $ac_foo" >&5
+echo "$as_me:16416: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:11388: checking for struct addrinfo" >&5
+	echo "$as_me:16421: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if test "${ac_cv_type_struct_addrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11394 "configure"
+#line 16427 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11406,16 +16439,17 @@ if (sizeof (struct addrinfo))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11412: \$? = $ac_status" >&5
+  echo "$as_me:16445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11414: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16448: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11417: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16451: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_addrinfo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11424,7 +16458,7 @@ ac_cv_type_struct_addrinfo=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11427: result: $ac_cv_type_struct_addrinfo" >&5
+echo "$as_me:16461: result: $ac_cv_type_struct_addrinfo" >&5
 echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
 if test $ac_cv_type_struct_addrinfo = yes; then
 
@@ -11443,13 +16477,13 @@ EOF
 fi
 
 cv=`echo "struct ifaddrs" | sed 'y%./+- %__p__%'`
-echo "$as_me:11446: checking for struct ifaddrs" >&5
+echo "$as_me:16480: checking for struct ifaddrs" >&5
 echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11452 "configure"
+#line 16486 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -11466,16 +16500,17 @@ struct ifaddrs foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11472: \$? = $ac_status" >&5
+  echo "$as_me:16506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11474: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16509: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11477: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16512: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -11485,18 +16520,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:11488: result: $ac_foo" >&5
+echo "$as_me:16523: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct ifaddrs | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:11493: checking for struct ifaddrs" >&5
+	echo "$as_me:16528: checking for struct ifaddrs" >&5
 echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
 if test "${ac_cv_type_struct_ifaddrs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11499 "configure"
+#line 16534 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11511,16 +16546,17 @@ if (sizeof (struct ifaddrs))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11517: \$? = $ac_status" >&5
+  echo "$as_me:16552: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11519: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16555: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11522: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16558: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_ifaddrs=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11529,7 +16565,7 @@ ac_cv_type_struct_ifaddrs=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11532: result: $ac_cv_type_struct_ifaddrs" >&5
+echo "$as_me:16568: result: $ac_cv_type_struct_ifaddrs" >&5
 echo "${ECHO_T}$ac_cv_type_struct_ifaddrs" >&6
 if test $ac_cv_type_struct_ifaddrs = yes; then
 
@@ -11547,7 +16583,7 @@ EOF
 
 fi
 
-echo "$as_me:11550: checking for struct winsize" >&5
+echo "$as_me:16586: checking for struct winsize" >&5
 echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
 if test "${ac_cv_struct_winsize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11556,7 +16592,7 @@ else
 ac_cv_struct_winsize=no
 for i in sys/termios.h sys/ioctl.h; do
 cat >conftest.$ac_ext <<_ACEOF
-#line 11559 "configure"
+#line 16595 "configure"
 #include "confdefs.h"
 #include <$i>
 
@@ -11577,10 +16613,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:11580: result: $ac_cv_struct_winsize" >&5
+echo "$as_me:16616: result: $ac_cv_struct_winsize" >&5
 echo "${ECHO_T}$ac_cv_struct_winsize" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 11583 "configure"
+#line 16619 "configure"
 #include "confdefs.h"
 #include <termios.h>
 
@@ -11596,7 +16632,7 @@ fi
 rm -f conftest*
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11599 "configure"
+#line 16635 "configure"
 #include "confdefs.h"
 #include <termios.h>
 
@@ -11611,14 +16647,14 @@ EOF
 fi
 rm -f conftest*
 
-echo "$as_me:11614: checking for struct spwd" >&5
+echo "$as_me:16650: checking for struct spwd" >&5
 echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
 if test "${ac_cv_struct_spwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11621 "configure"
+#line 16657 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 #ifdef HAVE_SHADOW_H
@@ -11633,16 +16669,17 @@ struct spwd foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11639: \$? = $ac_status" >&5
+  echo "$as_me:16675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11641: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16678: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11644: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16681: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_struct_spwd=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -11653,7 +16690,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:11656: result: $ac_cv_struct_spwd" >&5
+echo "$as_me:16693: result: $ac_cv_struct_spwd" >&5
 echo "${ECHO_T}$ac_cv_struct_spwd" >&6
 
 if test "$ac_cv_struct_spwd" = "yes"; then
@@ -11678,7 +16715,7 @@ fi;
 if test "${with_openldap_lib+set}" = set; then
   withval="$with_openldap_lib"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:11681: error: No argument for --with-openldap-lib" >&5
+  { { echo "$as_me:16718: error: No argument for --with-openldap-lib" >&5
 echo "$as_me: error: No argument for --with-openldap-lib" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_openldap" = "X"; then
@@ -11690,7 +16727,7 @@ fi;
 if test "${with_openldap_include+set}" = set; then
   withval="$with_openldap_include"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:11693: error: No argument for --with-openldap-include" >&5
+  { { echo "$as_me:16730: error: No argument for --with-openldap-include" >&5
 echo "$as_me: error: No argument for --with-openldap-include" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_openldap" = "X"; then
@@ -11698,7 +16735,7 @@ elif test "X$with_openldap" = "X"; then
 fi
 fi;
 
-echo "$as_me:11701: checking for openldap" >&5
+echo "$as_me:16738: checking for openldap" >&5
 echo $ECHO_N "checking for openldap... $ECHO_C" >&6
 
 case "$with_openldap" in
@@ -11738,8 +16775,9 @@ ires= lres=
 for i in $header_dirs; do
 	CFLAGS="-I$i $save_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11741 "configure"
+#line 16778 "configure"
 #include "confdefs.h"
+#include <lber.h>
 #include <ldap.h>
 int
 main ()
@@ -11750,16 +16788,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11756: \$? = $ac_status" >&5
+  echo "$as_me:16794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11758: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16797: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11761: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16800: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ires=$i;break
 else
   echo "$as_me: failed program was:" >&5
@@ -11770,8 +16809,9 @@ done
 for i in $lib_dirs; do
 	LIBS="-L$i -lldap -llber  $save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11773 "configure"
+#line 16812 "configure"
 #include "confdefs.h"
+#include <lber.h>
 #include <ldap.h>
 int
 main ()
@@ -11782,22 +16822,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11788: \$? = $ac_status" >&5
+  echo "$as_me:16828: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11790: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11793: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16834: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lres=$i;break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
@@ -11813,13 +16854,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 	with_openldap=yes
-	echo "$as_me:11816: result: headers $ires, libraries $lres" >&5
+	echo "$as_me:16857: result: headers $ires, libraries $lres" >&5
 echo "${ECHO_T}headers $ires, libraries $lres" >&6
 else
 	INCLUDE_openldap=
 	LIB_openldap=
 	with_openldap=no
-	echo "$as_me:11822: result: $with_openldap" >&5
+	echo "$as_me:16863: result: $with_openldap" >&5
 echo "${ECHO_T}$with_openldap" >&6
 fi
 
@@ -11837,7 +16878,7 @@ fi;
 if test "${with_krb4_lib+set}" = set; then
   withval="$with_krb4_lib"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:11840: error: No argument for --with-krb4-lib" >&5
+  { { echo "$as_me:16881: error: No argument for --with-krb4-lib" >&5
 echo "$as_me: error: No argument for --with-krb4-lib" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_krb4" = "X"; then
@@ -11849,7 +16890,7 @@ fi;
 if test "${with_krb4_include+set}" = set; then
   withval="$with_krb4_include"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:11852: error: No argument for --with-krb4-include" >&5
+  { { echo "$as_me:16893: error: No argument for --with-krb4-include" >&5
 echo "$as_me: error: No argument for --with-krb4-include" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_krb4" = "X"; then
@@ -11857,7 +16898,7 @@ elif test "X$with_krb4" = "X"; then
 fi
 fi;
 
-echo "$as_me:11860: checking for krb4" >&5
+echo "$as_me:16901: checking for krb4" >&5
 echo $ECHO_N "checking for krb4... $ECHO_C" >&6
 
 case "$with_krb4" in
@@ -11897,7 +16938,7 @@ ires= lres=
 for i in $header_dirs; do
 	CFLAGS="-I$i $save_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11900 "configure"
+#line 16941 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int
@@ -11909,16 +16950,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11915: \$? = $ac_status" >&5
+  echo "$as_me:16956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11917: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:16959: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11920: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16962: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ires=$i;break
 else
   echo "$as_me: failed program was:" >&5
@@ -11929,7 +16971,7 @@ done
 for i in $lib_dirs; do
 	LIBS="-L$i -lkrb -ldes $save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11932 "configure"
+#line 16974 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int
@@ -11941,22 +16983,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16986: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11947: \$? = $ac_status" >&5
+  echo "$as_me:16989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:11949: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:16992: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11952: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:16995: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lres=$i;break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
@@ -11972,13 +17015,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 	with_krb4=yes
-	echo "$as_me:11975: result: headers $ires, libraries $lres" >&5
+	echo "$as_me:17018: result: headers $ires, libraries $lres" >&5
 echo "${ECHO_T}headers $ires, libraries $lres" >&6
 else
 	INCLUDE_krb4=
 	LIB_krb4=
 	with_krb4=no
-	echo "$as_me:11981: result: $with_krb4" >&5
+	echo "$as_me:17024: result: $with_krb4" >&5
 echo "${ECHO_T}$with_krb4" >&6
 fi
 
@@ -11990,13 +17033,13 @@ if test "$with_krb4" != "no"; then
 	LIBS="$LIB_krb4 -ldes $LIBS"
 	EXTRA_LIB45=lib45.a
 
-	echo "$as_me:11993: checking for four valued krb_put_int" >&5
+	echo "$as_me:17036: checking for four valued krb_put_int" >&5
 echo $ECHO_N "checking for four valued krb_put_int... $ECHO_C" >&6
 if test "${ac_cv_func_krb_put_int_four+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11999 "configure"
+#line 17042 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int
@@ -12010,16 +17053,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17056: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12016: \$? = $ac_status" >&5
+  echo "$as_me:17059: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12018: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17062: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12021: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17065: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_krb_put_int_four=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -12029,7 +17073,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12032: result: $ac_cv_func_krb_put_int_four" >&5
+echo "$as_me:17076: result: $ac_cv_func_krb_put_int_four" >&5
 echo "${ECHO_T}$ac_cv_func_krb_put_int_four" >&6
 	if test "$ac_cv_func_krb_put_int_four" = yes; then
 
@@ -12039,13 +17083,13 @@ EOF
 
 	fi
 
-	echo "$as_me:12042: checking for KRB_VERIFY_SECURE" >&5
+	echo "$as_me:17086: checking for KRB_VERIFY_SECURE" >&5
 echo $ECHO_N "checking for KRB_VERIFY_SECURE... $ECHO_C" >&6
 if test "${ac_cv_func_krb_verify_secure+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12048 "configure"
+#line 17092 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int
@@ -12058,16 +17102,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12064: \$? = $ac_status" >&5
+  echo "$as_me:17108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12066: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17111: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12069: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17114: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_krb_verify_secure=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -12077,7 +17122,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12080: result: $ac_cv_func_krb_verify_secure" >&5
+echo "$as_me:17125: result: $ac_cv_func_krb_verify_secure" >&5
 echo "${ECHO_T}$ac_cv_func_krb_verify_secure" >&6
 	if test "$ac_cv_func_krb_verify_secure" != yes; then
 
@@ -12090,13 +17135,13 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	fi
-	echo "$as_me:12093: checking for KRB_VERIFY_NOT_SECURE" >&5
+	echo "$as_me:17138: checking for KRB_VERIFY_NOT_SECURE" >&5
 echo $ECHO_N "checking for KRB_VERIFY_NOT_SECURE... $ECHO_C" >&6
 if test "${ac_cv_func_krb_verify_not_secure+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12099 "configure"
+#line 17144 "configure"
 #include "confdefs.h"
 #include <krb.h>
 int
@@ -12109,16 +17154,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12112: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17157: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12115: \$? = $ac_status" >&5
+  echo "$as_me:17160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12117: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17163: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12120: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17166: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_krb_verify_not_secure=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -12128,7 +17174,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12131: result: $ac_cv_func_krb_verify_not_secure" >&5
+echo "$as_me:17177: result: $ac_cv_func_krb_verify_not_secure" >&5
 echo "${ECHO_T}$ac_cv_func_krb_verify_not_secure" >&6
 	if test "$ac_cv_func_krb_verify_not_secure" != yes; then
 
@@ -12138,7 +17184,7 @@ EOF
 
 	fi
 
-echo "$as_me:12141: checking for krb_enable_debug" >&5
+echo "$as_me:17187: checking for krb_enable_debug" >&5
 echo $ECHO_N "checking for krb_enable_debug... $ECHO_C" >&6
 if test "${ac_cv_funclib_krb_enable_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12147,14 +17193,16 @@ else
 if eval "test \"\$ac_cv_func_krb_enable_debug\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12157 "configure"
+#line 17205 "configure"
 #include "confdefs.h"
 
 int
@@ -12166,22 +17214,23 @@ krb_enable_debug()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12172: \$? = $ac_status" >&5
+  echo "$as_me:17220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12174: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12177: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17226: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_enable_debug=$ac_lib; else ac_cv_funclib_krb_enable_debug=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_krb_enable_debug=\${ac_cv_funclib_krb_enable_debug-no}"
 	LIBS="$ac_save_LIBS"
@@ -12195,14 +17244,14 @@ if false; then
 
 for ac_func in krb_enable_debug
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:12199: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:17248: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12205 "configure"
+#line 17254 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12233,29 +17282,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12239: \$? = $ac_status" >&5
+  echo "$as_me:17288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12241: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17291: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12244: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:17294: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12254: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:17304: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -12275,13 +17325,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:12278: result: yes" >&5
+	echo "$as_me:17328: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_krb_enable_debug=no"
 	eval "LIB_krb_enable_debug="
-	echo "$as_me:12284: result: no" >&5
+	echo "$as_me:17334: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -12295,7 +17345,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:12298: result: yes, in $ac_res" >&5
+	echo "$as_me:17348: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -12304,7 +17354,7 @@ if test -n "$LIB_krb_enable_debug"; then
 	LIBS="$LIB_krb_enable_debug $LIBS"
 fi
 
-echo "$as_me:12307: checking for krb_disable_debug" >&5
+echo "$as_me:17357: checking for krb_disable_debug" >&5
 echo $ECHO_N "checking for krb_disable_debug... $ECHO_C" >&6
 if test "${ac_cv_funclib_krb_disable_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12313,14 +17363,16 @@ else
 if eval "test \"\$ac_cv_func_krb_disable_debug\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12323 "configure"
+#line 17375 "configure"
 #include "confdefs.h"
 
 int
@@ -12332,22 +17384,23 @@ krb_disable_debug()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12338: \$? = $ac_status" >&5
+  echo "$as_me:17390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12340: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17393: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12343: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17396: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_disable_debug=$ac_lib; else ac_cv_funclib_krb_disable_debug=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_krb_disable_debug=\${ac_cv_funclib_krb_disable_debug-no}"
 	LIBS="$ac_save_LIBS"
@@ -12361,14 +17414,14 @@ if false; then
 
 for ac_func in krb_disable_debug
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:12365: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:17418: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12371 "configure"
+#line 17424 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12399,29 +17452,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12405: \$? = $ac_status" >&5
+  echo "$as_me:17458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12407: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17461: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12410: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:17464: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12420: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:17474: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -12441,13 +17495,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:12444: result: yes" >&5
+	echo "$as_me:17498: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_krb_disable_debug=no"
 	eval "LIB_krb_disable_debug="
-	echo "$as_me:12450: result: no" >&5
+	echo "$as_me:17504: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -12461,7 +17515,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:12464: result: yes, in $ac_res" >&5
+	echo "$as_me:17518: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -12470,7 +17524,7 @@ if test -n "$LIB_krb_disable_debug"; then
 	LIBS="$LIB_krb_disable_debug $LIBS"
 fi
 
-echo "$as_me:12473: checking for krb_get_our_ip_for_realm" >&5
+echo "$as_me:17527: checking for krb_get_our_ip_for_realm" >&5
 echo $ECHO_N "checking for krb_get_our_ip_for_realm... $ECHO_C" >&6
 if test "${ac_cv_funclib_krb_get_our_ip_for_realm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12479,14 +17533,16 @@ else
 if eval "test \"\$ac_cv_func_krb_get_our_ip_for_realm\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 12489 "configure"
+#line 17545 "configure"
 #include "confdefs.h"
 
 int
@@ -12498,22 +17554,23 @@ krb_get_our_ip_for_realm()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17557: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12504: \$? = $ac_status" >&5
+  echo "$as_me:17560: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12506: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17563: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12509: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17566: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_our_ip_for_realm=$ac_lib; else ac_cv_funclib_krb_get_our_ip_for_realm=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_krb_get_our_ip_for_realm=\${ac_cv_funclib_krb_get_our_ip_for_realm-no}"
 	LIBS="$ac_save_LIBS"
@@ -12527,14 +17584,14 @@ if false; then
 
 for ac_func in krb_get_our_ip_for_realm
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:12531: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:17588: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12537 "configure"
+#line 17594 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12565,29 +17622,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12571: \$? = $ac_status" >&5
+  echo "$as_me:17628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12573: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17631: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12576: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:17634: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12586: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:17644: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -12607,13 +17665,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:12610: result: yes" >&5
+	echo "$as_me:17668: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_krb_get_our_ip_for_realm=no"
 	eval "LIB_krb_get_our_ip_for_realm="
-	echo "$as_me:12616: result: no" >&5
+	echo "$as_me:17674: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -12627,7 +17685,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:12630: result: yes, in $ac_res" >&5
+	echo "$as_me:17688: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -12636,13 +17694,13 @@ if test -n "$LIB_krb_get_our_ip_for_realm"; then
 	LIBS="$LIB_krb_get_our_ip_for_realm $LIBS"
 fi
 
-	echo "$as_me:12639: checking for krb_mk_req with const arguments" >&5
+	echo "$as_me:17697: checking for krb_mk_req with const arguments" >&5
 echo $ECHO_N "checking for krb_mk_req with const arguments... $ECHO_C" >&6
 if test "${ac_cv_func_krb_mk_req_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12645 "configure"
+#line 17703 "configure"
 #include "confdefs.h"
 #include <krb.h>
 		int krb_mk_req(KTEXT a, const char *s, const char *i,
@@ -12657,16 +17715,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12663: \$? = $ac_status" >&5
+  echo "$as_me:17721: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:12665: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17724: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:17727: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_krb_mk_req_const=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -12676,7 +17735,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:12679: result: $ac_cv_func_krb_mk_req_const" >&5
+echo "$as_me:17738: result: $ac_cv_func_krb_mk_req_const" >&5
 echo "${ECHO_T}$ac_cv_func_krb_mk_req_const" >&6
 	if test "$ac_cv_func_krb_mk_req_const" = "yes"; then
 
@@ -12746,49 +17805,12 @@ fi
 
 ## XXX quite horrible:
 if test -f /etc/ibmcxx.cfg; then
-	dpagaix_LDADD=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/libraries/{;s/^^=*=\(.*\)/\1/;s/,/ /gp;}'`
-	dpagaix_CFLAGS=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/options/{;s/^^=*=\(.*\)/\1/;s/-q^,*//;s/,/ /gp;}'`
+	dpagaix_LDADD=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/libraries/{;s/^[^=]*=\(.*\)/\1/;s/,/ /gp;}'`
+	dpagaix_CFLAGS=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/options/{;s/^[^=]*=\(.*\)/\1/;s/-q^,*//;s/,/ /gp;}'`
 else
 	dpagaix_CFLAGS="-D_THREAD_SAFE -D_AIX_PTHREADS_D7 -D_AIX32_THREADS=1 -D_AES_SOURCE -D_AIX41 -I/usr/include/dce"
 	dpagaix_LDADD="-L/usr/lib/threads -ldcelibc_r -ldcepthreads -lpthreads_compat lpthreads -lc_r"
-fi
-
-# Check whether --enable-kaserver or --disable-kaserver was given.
-if test "${enable_kaserver+set}" = set; then
-  enableval="$enable_kaserver"
-
-fi;
-if test "$enable_kaserver" = yes; then
-
-cat >>confdefs.h <<\EOF
-#define KASERVER 1
-EOF
-
-	if test "$with_krb4" = "no"; then
-		{ { echo "$as_me:12768: error: kaserver requires krb4" >&5
-echo "$as_me: error: kaserver requires krb4" >&2;}
-   { (exit 1); exit 1; }; }
-		exit 1
-	fi
-fi
-
-# Check whether --enable-kaserver-db or --disable-kaserver-db was given.
-if test "${enable_kaserver_db+set}" = set; then
-  enableval="$enable_kaserver_db"
-
-fi;
-if test "$enable_kaserver_db" = yes; then
-
-cat >>confdefs.h <<\EOF
-#define KASERVER_DB 1
-EOF
-
-	if test "$with_krb4" = "no"; then
-		{ { echo "$as_me:12787: error: kaserver-db requires krb4" >&5
-echo "$as_me: error: kaserver-db requires krb4" >&2;}
-   { (exit 1); exit 1; }; }
-		exit 1
-	fi
+	dpagaix_LDFLAGS="-Wl,-bI:dfspag.exp"
 fi
 
 otp=yes
@@ -12835,7 +17857,7 @@ fi
 
 # Extract the first word of "nroff", so it can be a program name with args.
 set dummy nroff; ac_word=$2
-echo "$as_me:12838: checking for $ac_word" >&5
+echo "$as_me:17860: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NROFF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12845,13 +17867,14 @@ else
   ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
   ;;
   *)
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NROFF="$ac_dir/$ac_word"
+   echo "$as_me:17877: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -12862,16 +17885,16 @@ fi
 NROFF=$ac_cv_path_NROFF
 
 if test -n "$NROFF"; then
-  echo "$as_me:12865: result: $NROFF" >&5
+  echo "$as_me:17888: result: $NROFF" >&5
 echo "${ECHO_T}$NROFF" >&6
 else
-  echo "$as_me:12868: result: no" >&5
+  echo "$as_me:17891: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "groff", so it can be a program name with args.
 set dummy groff; ac_word=$2
-echo "$as_me:12874: checking for $ac_word" >&5
+echo "$as_me:17897: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GROFF+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12881,13 +17904,14 @@ else
   ac_cv_path_GROFF="$GROFF" # Let the user override the test with a path.
   ;;
   *)
-  ac_save_IFS=$IFS; IFS=':'
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
 ac_dummy="$PATH"
 for ac_dir in $ac_dummy; do
   IFS=$ac_save_IFS
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_GROFF="$ac_dir/$ac_word"
+   echo "$as_me:17914: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -12898,14 +17922,14 @@ fi
 GROFF=$ac_cv_path_GROFF
 
 if test -n "$GROFF"; then
-  echo "$as_me:12901: result: $GROFF" >&5
+  echo "$as_me:17925: result: $GROFF" >&5
 echo "${ECHO_T}$GROFF" >&6
 else
-  echo "$as_me:12904: result: no" >&5
+  echo "$as_me:17928: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12908: checking how to format man pages" >&5
+echo "$as_me:17932: checking how to format man pages" >&5
 echo $ECHO_N "checking how to format man pages... $ECHO_C" >&6
 if test "${ac_cv_sys_man_format+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12942,7 +17966,7 @@ if test "$ac_cv_sys_man_format"; then
 fi
 
 fi
-echo "$as_me:12945: result: $ac_cv_sys_man_format" >&5
+echo "$as_me:17969: result: $ac_cv_sys_man_format" >&5
 echo "${ECHO_T}$ac_cv_sys_man_format" >&6
 if test "$ac_cv_sys_man_format"; then
 	CATMAN="$ac_cv_sys_man_format"
@@ -12956,7 +17980,7 @@ else
   CATMAN_TRUE='#'
   CATMAN_FALSE=
 fi
-echo "$as_me:12959: checking extension of pre-formatted manual pages" >&5
+echo "$as_me:17983: checking extension of pre-formatted manual pages" >&5
 echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
 if test "${ac_cv_sys_catman_ext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12968,7 +17992,7 @@ else
 fi
 
 fi
-echo "$as_me:12971: result: $ac_cv_sys_catman_ext" >&5
+echo "$as_me:17995: result: $ac_cv_sys_catman_ext" >&5
 echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
 if test "$ac_cv_sys_catman_ext" = number; then
 	CATMANEXT='$$section'
@@ -12986,7 +18010,7 @@ fi;
 if test "${with_readline_lib+set}" = set; then
   withval="$with_readline_lib"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:12989: error: No argument for --with-readline-lib" >&5
+  { { echo "$as_me:18013: error: No argument for --with-readline-lib" >&5
 echo "$as_me: error: No argument for --with-readline-lib" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_readline" = "X"; then
@@ -12998,7 +18022,7 @@ fi;
 if test "${with_readline_include+set}" = set; then
   withval="$with_readline_include"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:13001: error: No argument for --with-readline-include" >&5
+  { { echo "$as_me:18025: error: No argument for --with-readline-include" >&5
 echo "$as_me: error: No argument for --with-readline-include" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_readline" = "X"; then
@@ -13006,7 +18030,7 @@ elif test "X$with_readline" = "X"; then
 fi
 fi;
 
-echo "$as_me:13009: checking for readline" >&5
+echo "$as_me:18033: checking for readline" >&5
 echo $ECHO_N "checking for readline... $ECHO_C" >&6
 
 case "$with_readline" in
@@ -13046,7 +18070,7 @@ ires= lres=
 for i in $header_dirs; do
 	CFLAGS="-I$i $save_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13049 "configure"
+#line 18073 "configure"
 #include "confdefs.h"
 #include <stdio.h>
  #include <readline.h>
@@ -13059,16 +18083,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13065: \$? = $ac_status" >&5
+  echo "$as_me:18089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13067: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:18092: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13070: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18095: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ires=$i;break
 else
   echo "$as_me: failed program was:" >&5
@@ -13079,7 +18104,7 @@ done
 for i in $lib_dirs; do
 	LIBS="-L$i -lreadline  $save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13082 "configure"
+#line 18107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
  #include <readline.h>
@@ -13092,22 +18117,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13098: \$? = $ac_status" >&5
+  echo "$as_me:18123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13100: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:18126: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13103: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18129: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lres=$i;break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
@@ -13123,13 +18149,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 	with_readline=yes
-	echo "$as_me:13126: result: headers $ires, libraries $lres" >&5
+	echo "$as_me:18152: result: headers $ires, libraries $lres" >&5
 echo "${ECHO_T}headers $ires, libraries $lres" >&6
 else
 	INCLUDE_readline=
 	LIB_readline=
 	with_readline=no
-	echo "$as_me:13132: result: $with_readline" >&5
+	echo "$as_me:18158: result: $with_readline" >&5
 echo "${ECHO_T}$with_readline" >&6
 fi
 
@@ -13143,7 +18169,7 @@ fi;
 if test "${with_hesiod_lib+set}" = set; then
   withval="$with_hesiod_lib"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:13146: error: No argument for --with-hesiod-lib" >&5
+  { { echo "$as_me:18172: error: No argument for --with-hesiod-lib" >&5
 echo "$as_me: error: No argument for --with-hesiod-lib" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_hesiod" = "X"; then
@@ -13155,7 +18181,7 @@ fi;
 if test "${with_hesiod_include+set}" = set; then
   withval="$with_hesiod_include"
   if test "$withval" = "yes" -o "$withval" = "no"; then
-  { { echo "$as_me:13158: error: No argument for --with-hesiod-include" >&5
+  { { echo "$as_me:18184: error: No argument for --with-hesiod-include" >&5
 echo "$as_me: error: No argument for --with-hesiod-include" >&2;}
    { (exit 1); exit 1; }; }
 elif test "X$with_hesiod" = "X"; then
@@ -13163,7 +18189,7 @@ elif test "X$with_hesiod" = "X"; then
 fi
 fi;
 
-echo "$as_me:13166: checking for hesiod" >&5
+echo "$as_me:18192: checking for hesiod" >&5
 echo $ECHO_N "checking for hesiod... $ECHO_C" >&6
 
 case "$with_hesiod" in
@@ -13203,7 +18229,7 @@ ires= lres=
 for i in $header_dirs; do
 	CFLAGS="-I$i $save_CFLAGS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13206 "configure"
+#line 18232 "configure"
 #include "confdefs.h"
 #include <hesiod.h>
 int
@@ -13215,16 +18241,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13218: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13221: \$? = $ac_status" >&5
+  echo "$as_me:18247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13223: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:18250: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13226: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18253: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ires=$i;break
 else
   echo "$as_me: failed program was:" >&5
@@ -13235,7 +18262,7 @@ done
 for i in $lib_dirs; do
 	LIBS="-L$i -lhesiod  $save_LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13238 "configure"
+#line 18265 "configure"
 #include "confdefs.h"
 #include <hesiod.h>
 int
@@ -13247,22 +18274,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13253: \$? = $ac_status" >&5
+  echo "$as_me:18280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13255: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:18283: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13258: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18286: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   lres=$i;break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
@@ -13278,13 +18306,13 @@ cat >>confdefs.h <<EOF
 EOF
 
 	with_hesiod=yes
-	echo "$as_me:13281: result: headers $ires, libraries $lres" >&5
+	echo "$as_me:18309: result: headers $ires, libraries $lres" >&5
 echo "${ECHO_T}headers $ires, libraries $lres" >&6
 else
 	INCLUDE_hesiod=
 	LIB_hesiod=
 	with_hesiod=no
-	echo "$as_me:13287: result: $with_hesiod" >&5
+	echo "$as_me:18315: result: $with_hesiod" >&5
 echo "${ECHO_T}$with_hesiod" >&6
 fi
 
@@ -13298,13 +18326,13 @@ if test "${enable_littleendian+set}" = set; then
   enableval="$enable_littleendian"
   krb_cv_c_bigendian=no
 fi;
-echo "$as_me:13301: checking whether byte order is known at compile time" >&5
+echo "$as_me:18329: checking whether byte order is known at compile time" >&5
 echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
 if test "${krb_cv_c_bigendian_compile+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13307 "configure"
+#line 18335 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13321,16 +18349,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13327: \$? = $ac_status" >&5
+  echo "$as_me:18355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13329: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:18358: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13332: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18361: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   krb_cv_c_bigendian_compile=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13339,9 +18368,9 @@ krb_cv_c_bigendian_compile=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13342: result: $krb_cv_c_bigendian_compile" >&5
+echo "$as_me:18371: result: $krb_cv_c_bigendian_compile" >&5
 echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
-echo "$as_me:13344: checking whether byte ordering is bigendian" >&5
+echo "$as_me:18373: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${krb_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13349,7 +18378,7 @@ else
 
   if test "$krb_cv_c_bigendian_compile" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 13352 "configure"
+#line 18381 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13366,16 +18395,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13372: \$? = $ac_status" >&5
+  echo "$as_me:18401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13374: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13377: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18407: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   krb_cv_c_bigendian=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -13385,12 +18415,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   else
     if test "$cross_compiling" = yes; then
-  { { echo "$as_me:13388: error: specify either --enable-bigendian or --enable-littleendian" >&5
+  { { echo "$as_me:18418: error: specify either --enable-bigendian or --enable-littleendian" >&5
 echo "$as_me: error: specify either --enable-bigendian or --enable-littleendian" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13393 "configure"
+#line 18423 "configure"
 #include "confdefs.h"
 main () {
       /* Are we little or big endian?  From Harbison&Steele.  */
@@ -13404,15 +18434,16 @@ main () {
   }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13410: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:13411: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:18440: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:18442: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13414: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18445: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   krb_cv_c_bigendian=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -13420,12 +18451,12 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 krb_cv_c_bigendian=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
   fi
 
 fi
-echo "$as_me:13428: result: $krb_cv_c_bigendian" >&5
+echo "$as_me:18459: result: $krb_cv_c_bigendian" >&5
 echo "${ECHO_T}$krb_cv_c_bigendian" >&6
 if test "$krb_cv_c_bigendian" = "yes"; then
 
@@ -13440,7 +18471,7 @@ cat >>confdefs.h <<\EOF
 EOF
 fi
 
-echo "$as_me:13443: checking for inline" >&5
+echo "$as_me:18474: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13448,24 +18479,26 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 13451 "configure"
+#line 18482 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
+static $ac_kw int static_foo () {return 0; }
 $ac_kw int foo () {return 0; }
 #endif
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13459: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18491: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13462: \$? = $ac_status" >&5
+  echo "$as_me:18494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13464: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:18497: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13467: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18500: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   echo "$as_me: failed program was:" >&5
@@ -13475,7 +18508,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:13478: result: $ac_cv_c_inline" >&5
+echo "$as_me:18511: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -13525,7 +18558,7 @@ else
   AIX_DYNAMIC_AFS_FALSE=
 fi
 
-echo "$as_me:13528: checking for dlopen" >&5
+echo "$as_me:18561: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 if test "${ac_cv_funclib_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13534,14 +18567,16 @@ else
 if eval "test \"\$ac_cv_func_dlopen\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" dl; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13544 "configure"
+#line 18579 "configure"
 #include "confdefs.h"
 
 int
@@ -13553,22 +18588,23 @@ dlopen()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18591: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13559: \$? = $ac_status" >&5
+  echo "$as_me:18594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13561: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:18597: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13564: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18600: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dlopen=$ac_lib; else ac_cv_funclib_dlopen=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_dlopen=\${ac_cv_funclib_dlopen-no}"
 	LIBS="$ac_save_LIBS"
@@ -13582,14 +18618,14 @@ if false; then
 
 for ac_func in dlopen
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:13586: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:18622: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 13592 "configure"
+#line 18628 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13620,29 +18656,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13626: \$? = $ac_status" >&5
+  echo "$as_me:18662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13628: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:18665: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13631: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:18668: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13641: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:18678: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -13662,13 +18699,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:13665: result: yes" >&5
+	echo "$as_me:18702: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_dlopen=no"
 	eval "LIB_dlopen="
-	echo "$as_me:13671: result: no" >&5
+	echo "$as_me:18708: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -13682,7 +18719,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:13685: result: yes, in $ac_res" >&5
+	echo "$as_me:18722: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -13722,7 +18759,7 @@ else
   IRIX_FALSE=
 fi
 
-echo "$as_me:13725: checking for X" >&5
+echo "$as_me:18762: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -13744,9 +18781,9 @@ else
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
+rm -fr conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir
   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'EOF'
 acfindx:
@@ -13775,7 +18812,7 @@ EOF
     esac
   fi
   cd ..
-  rm -fr conftestdir
+  rm -fr conftest.dir
 fi
 
 # Standard set of common directories for X headers.
@@ -13819,18 +18856,18 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 13822 "configure"
+#line 18859 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:13826: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:18863: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:13832: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18869: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -13862,7 +18899,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 13865 "configure"
+#line 18902 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -13874,16 +18911,17 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13880: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13882: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:18920: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13885: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:18923: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
@@ -13902,7 +18940,7 @@ do
   done
 done
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
 if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
@@ -13920,7 +18958,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:13923: result: $have_x" >&5
+  echo "$as_me:18961: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -13930,7 +18968,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:13933: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:18971: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -13954,11 +18992,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:13957: checking whether -R must be followed by a space" >&5
+      echo "$as_me:18995: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 13961 "configure"
+#line 18999 "configure"
 #include "confdefs.h"
 
 int
@@ -13970,31 +19008,32 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13976: \$? = $ac_status" >&5
+  echo "$as_me:19014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:13978: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19017: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13981: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19020: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_R_nospace=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:13991: result: no" >&5
+	echo "$as_me:19030: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13997 "configure"
+#line 19036 "configure"
 #include "confdefs.h"
 
 int
@@ -14006,29 +19045,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14012: \$? = $ac_status" >&5
+  echo "$as_me:19051: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14014: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19054: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14017: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19057: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_R_space=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_R_space=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:14027: result: yes" >&5
+	  echo "$as_me:19067: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:14031: result: neither works" >&5
+	  echo "$as_me:19071: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -14046,7 +19086,43 @@ echo "${ECHO_T}neither works" >&6
     # Martyn Johnson says this is needed for Ultrix, if the X
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
-    echo "$as_me:14049: checking for dnet_ntoa in -ldnet" >&5
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 19091 "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XOpenDisplay ();
+int
+main ()
+{
+XOpenDisplay ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:19110: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:19113: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19116: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:19119: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:19125: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14054,7 +19130,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14057 "configure"
+#line 19133 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14073,33 +19149,34 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14079: \$? = $ac_status" >&5
+  echo "$as_me:19155: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14081: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19158: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14084: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19161: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_dnet_dnet_ntoa=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14095: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:19172: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:14102: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:19179: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14107,7 +19184,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14110 "configure"
+#line 19187 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14126,32 +19203,36 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14132: \$? = $ac_status" >&5
+  echo "$as_me:19209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14134: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19212: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14137: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19215: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14148: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:19226: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.
@@ -14161,13 +19242,13 @@ fi
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:14164: checking for gethostbyname" >&5
+    echo "$as_me:19245: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14170 "configure"
+#line 19251 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -14198,29 +19279,30 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14204: \$? = $ac_status" >&5
+  echo "$as_me:19285: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14206: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14209: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19291: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_gethostbyname=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14219: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:19301: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:14223: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:19305: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14228,7 +19310,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14231 "configure"
+#line 19313 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14247,33 +19329,34 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14253: \$? = $ac_status" >&5
+  echo "$as_me:19335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14255: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14258: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19341: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14269: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:19352: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:14276: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:19359: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14281,7 +19364,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14284 "configure"
+#line 19367 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14300,26 +19383,27 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19386: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14306: \$? = $ac_status" >&5
+  echo "$as_me:19389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14308: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19392: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14311: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19395: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_bsd_gethostbyname=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14322: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:19406: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -14335,13 +19419,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:14338: checking for connect" >&5
+    echo "$as_me:19422: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14344 "configure"
+#line 19428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -14372,29 +19456,30 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14378: \$? = $ac_status" >&5
+  echo "$as_me:19462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14380: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19465: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14383: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19468: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_connect=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14393: result: $ac_cv_func_connect" >&5
+echo "$as_me:19478: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:14397: checking for connect in -lsocket" >&5
+      echo "$as_me:19482: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14402,7 +19487,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14405 "configure"
+#line 19490 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14421,26 +19506,27 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14427: \$? = $ac_status" >&5
+  echo "$as_me:19512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14429: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19515: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14432: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19518: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_socket_connect=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14443: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:19529: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -14449,13 +19535,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:14452: checking for remove" >&5
+    echo "$as_me:19538: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14458 "configure"
+#line 19544 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -14486,29 +19572,30 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14492: \$? = $ac_status" >&5
+  echo "$as_me:19578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14494: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19581: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14497: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19584: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_remove=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14507: result: $ac_cv_func_remove" >&5
+echo "$as_me:19594: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:14511: checking for remove in -lposix" >&5
+      echo "$as_me:19598: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14516,7 +19603,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14519 "configure"
+#line 19606 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14535,26 +19622,27 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14541: \$? = $ac_status" >&5
+  echo "$as_me:19628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14543: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19631: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14546: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19634: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_posix_remove=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14557: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:19645: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -14563,13 +19651,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:14566: checking for shmat" >&5
+    echo "$as_me:19654: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14572 "configure"
+#line 19660 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -14600,29 +19688,30 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14606: \$? = $ac_status" >&5
+  echo "$as_me:19694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14608: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19697: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14611: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19700: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_shmat=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14621: result: $ac_cv_func_shmat" >&5
+echo "$as_me:19710: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:14625: checking for shmat in -lipc" >&5
+      echo "$as_me:19714: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14630,7 +19719,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14633 "configure"
+#line 19722 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14649,26 +19738,27 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14652: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14655: \$? = $ac_status" >&5
+  echo "$as_me:19744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14657: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19747: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14660: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19750: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_ipc_shmat=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14671: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:19761: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -14686,7 +19776,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:14689: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:19779: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14694,7 +19784,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14697 "configure"
+#line 19787 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14713,26 +19803,27 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14719: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14721: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14724: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19815: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14735: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:19826: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -14745,7 +19836,7 @@ fi
 # try to figure out if we need any additional ld flags, like -R
 # and yes, the autoconf X test is utterly broken
 if test "$no_x" != yes; then
-	echo "$as_me:14748: checking for special X linker flags" >&5
+	echo "$as_me:19839: checking for special X linker flags" >&5
 echo $ECHO_N "checking for special X linker flags... $ECHO_C" >&6
 if test "${krb_cv_sys_x_libs_rpath+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14774,12 +19865,12 @@ else
 		fi
 		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 		if test "$cross_compiling" = yes; then
-  { { echo "$as_me:14777: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:19868: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14782 "configure"
+#line 19873 "configure"
 #include "confdefs.h"
 
 		#include <X11/Xlib.h>
@@ -14794,15 +19885,16 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14800: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:14801: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:19891: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:19893: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14804: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19896: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -14810,14 +19902,14 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 :
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 	done
 	LIBS="$ac_save_libs"
 	CFLAGS="$ac_save_cflags"
 
 fi
-echo "$as_me:14820: result: $krb_cv_sys_x_libs_rpath" >&5
+echo "$as_me:19912: result: $krb_cv_sys_x_libs_rpath" >&5
 echo "${ECHO_T}$krb_cv_sys_x_libs_rpath" >&6
 	X_LIBS="$krb_cv_sys_x_libs"
 fi
@@ -14837,7 +19929,7 @@ LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS $X_LIBS"
 
-echo "$as_me:14840: checking for XauWriteAuth" >&5
+echo "$as_me:19932: checking for XauWriteAuth" >&5
 echo $ECHO_N "checking for XauWriteAuth... $ECHO_C" >&6
 if test "${ac_cv_funclib_XauWriteAuth+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14846,14 +19938,16 @@ else
 if eval "test \"\$ac_cv_func_XauWriteAuth\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" X11 Xau; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14856 "configure"
+#line 19950 "configure"
 #include "confdefs.h"
 
 int
@@ -14865,22 +19959,23 @@ XauWriteAuth()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14871: \$? = $ac_status" >&5
+  echo "$as_me:19965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14873: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:19968: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14876: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:19971: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauWriteAuth=$ac_lib; else ac_cv_funclib_XauWriteAuth=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_XauWriteAuth=\${ac_cv_funclib_XauWriteAuth-no}"
 	LIBS="$ac_save_LIBS"
@@ -14894,14 +19989,14 @@ if false; then
 
 for ac_func in XauWriteAuth
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:14898: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:19993: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14904 "configure"
+#line 19999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -14932,29 +20027,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14938: \$? = $ac_status" >&5
+  echo "$as_me:20033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:14940: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20036: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14943: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:20039: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14953: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:20049: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -14974,13 +20070,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:14977: result: yes" >&5
+	echo "$as_me:20073: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_XauWriteAuth=no"
 	eval "LIB_XauWriteAuth="
-	echo "$as_me:14983: result: no" >&5
+	echo "$as_me:20079: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -14994,7 +20090,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:14997: result: yes, in $ac_res" >&5
+	echo "$as_me:20093: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -15002,7 +20098,7 @@ esac
 ac_xxx="$LIBS"
 LIBS="$LIB_XauWriteAuth $LIBS"
 
-echo "$as_me:15005: checking for XauReadAuth" >&5
+echo "$as_me:20101: checking for XauReadAuth" >&5
 echo $ECHO_N "checking for XauReadAuth... $ECHO_C" >&6
 if test "${ac_cv_funclib_XauReadAuth+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15011,14 +20107,16 @@ else
 if eval "test \"\$ac_cv_func_XauReadAuth\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" X11 Xau; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15021 "configure"
+#line 20119 "configure"
 #include "confdefs.h"
 
 int
@@ -15030,22 +20128,23 @@ XauReadAuth()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15036: \$? = $ac_status" >&5
+  echo "$as_me:20134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15038: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20137: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15041: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20140: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_XauReadAuth=\${ac_cv_funclib_XauReadAuth-no}"
 	LIBS="$ac_save_LIBS"
@@ -15059,14 +20158,14 @@ if false; then
 
 for ac_func in XauReadAuth
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:15063: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:20162: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15069 "configure"
+#line 20168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15097,29 +20196,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15103: \$? = $ac_status" >&5
+  echo "$as_me:20202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15105: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15108: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:20208: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15118: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:20218: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -15139,13 +20239,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:15142: result: yes" >&5
+	echo "$as_me:20242: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_XauReadAuth=no"
 	eval "LIB_XauReadAuth="
-	echo "$as_me:15148: result: no" >&5
+	echo "$as_me:20248: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -15159,14 +20259,14 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:15162: result: yes, in $ac_res" >&5
+	echo "$as_me:20262: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
 LIBS="$LIB_XauReadAauth $LIBS"
 
-echo "$as_me:15169: checking for XauFileName" >&5
+echo "$as_me:20269: checking for XauFileName" >&5
 echo $ECHO_N "checking for XauFileName... $ECHO_C" >&6
 if test "${ac_cv_funclib_XauFileName+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15175,14 +20275,16 @@ else
 if eval "test \"\$ac_cv_func_XauFileName\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" X11 Xau; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15185 "configure"
+#line 20287 "configure"
 #include "confdefs.h"
 
 int
@@ -15194,22 +20296,23 @@ XauFileName()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15200: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15202: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20305: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15205: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20308: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauFileName=$ac_lib; else ac_cv_funclib_XauFileName=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_XauFileName=\${ac_cv_funclib_XauFileName-no}"
 	LIBS="$ac_save_LIBS"
@@ -15223,14 +20326,14 @@ if false; then
 
 for ac_func in XauFileName
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:15227: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:20330: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15233 "configure"
+#line 20336 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15261,29 +20364,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15267: \$? = $ac_status" >&5
+  echo "$as_me:20370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15269: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:20373: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15272: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:20376: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15282: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:20386: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -15303,13 +20407,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:15306: result: yes" >&5
+	echo "$as_me:20410: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_XauFileName=no"
 	eval "LIB_XauFileName="
-	echo "$as_me:15312: result: no" >&5
+	echo "$as_me:20416: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -15323,7 +20427,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:15326: result: yes, in $ac_res" >&5
+	echo "$as_me:20430: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -15372,13 +20476,13 @@ CFLAGS=$save_CFLAGS
 LIBS=$save_LIBS
 LDFLAGS=$save_LDFLAGS
 
-echo "$as_me:15375: checking for an ANSI C-conforming const" >&5
+echo "$as_me:20479: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15381 "configure"
+#line 20485 "configure"
 #include "confdefs.h"
 
 int
@@ -15436,16 +20540,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20543: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15442: \$? = $ac_status" >&5
+  echo "$as_me:20546: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15444: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20549: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15447: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20552: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15454,7 +20559,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15457: result: $ac_cv_c_const" >&5
+echo "$as_me:20562: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -15464,13 +20569,13 @@ EOF
 
 fi
 
-echo "$as_me:15467: checking for off_t" >&5
+echo "$as_me:20572: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15473 "configure"
+#line 20578 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15485,16 +20590,17 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15491: \$? = $ac_status" >&5
+  echo "$as_me:20596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15493: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20599: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15496: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20602: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15503,7 +20609,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15506: result: $ac_cv_type_off_t" >&5
+echo "$as_me:20612: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -15515,13 +20621,13 @@ EOF
 
 fi
 
-echo "$as_me:15518: checking for size_t" >&5
+echo "$as_me:20624: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15524 "configure"
+#line 20630 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15536,16 +20642,17 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15542: \$? = $ac_status" >&5
+  echo "$as_me:20648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15544: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20651: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15547: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20654: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15554,7 +20661,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15557: result: $ac_cv_type_size_t" >&5
+echo "$as_me:20664: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -15566,13 +20673,13 @@ EOF
 
 fi
 
-echo "$as_me:15569: checking for ssize_t" >&5
+echo "$as_me:20676: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15575 "configure"
+#line 20682 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15590,7 +20697,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:15593: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:20700: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = no; then
 
@@ -15600,13 +20707,13 @@ EOF
 
 fi
 
-echo "$as_me:15603: checking for pid_t" >&5
+echo "$as_me:20710: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15609 "configure"
+#line 20716 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15621,16 +20728,17 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15627: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15629: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15632: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20740: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15639,7 +20747,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15642: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:20750: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -15651,13 +20759,13 @@ EOF
 
 fi
 
-echo "$as_me:15654: checking for uid_t in sys/types.h" >&5
+echo "$as_me:20762: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15660 "configure"
+#line 20768 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -15671,7 +20779,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:15674: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:20782: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -15685,13 +20793,13 @@ EOF
 
 fi
 
-echo "$as_me:15688: checking for mode_t" >&5
+echo "$as_me:20796: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15694 "configure"
+#line 20802 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15709,7 +20817,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:15712: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:20820: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = no; then
 
@@ -15719,13 +20827,13 @@ EOF
 
 fi
 
-echo "$as_me:15722: checking for sig_atomic_t" >&5
+echo "$as_me:20830: checking for sig_atomic_t" >&5
 echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
 if test "${ac_cv_type_sig_atomic_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15728 "configure"
+#line 20836 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15743,7 +20851,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:15746: result: $ac_cv_type_sig_atomic_t" >&5
+echo "$as_me:20854: result: $ac_cv_type_sig_atomic_t" >&5
 echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
 if test $ac_cv_type_sig_atomic_t = no; then
 
@@ -15754,13 +20862,13 @@ EOF
 fi
 
 cv=`echo "long long" | sed 'y%./+- %__p__%'`
-echo "$as_me:15757: checking for long long" >&5
+echo "$as_me:20865: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15763 "configure"
+#line 20871 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15777,16 +20885,17 @@ long long foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15783: \$? = $ac_status" >&5
+  echo "$as_me:20891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15785: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20894: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15788: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20897: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -15796,18 +20905,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:15799: result: $ac_foo" >&5
+echo "$as_me:20908: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:15804: checking for long long" >&5
+	echo "$as_me:20913: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15810 "configure"
+#line 20919 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -15822,16 +20931,17 @@ if (sizeof (long long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15825: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15828: \$? = $ac_status" >&5
+  echo "$as_me:20937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15830: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20940: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15833: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:20943: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15840,7 +20950,7 @@ ac_cv_type_long_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15843: result: $ac_cv_type_long_long" >&5
+echo "$as_me:20953: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6
 if test $ac_cv_type_long_long = yes; then
 
@@ -15858,13 +20968,13 @@ EOF
 
 fi
 
-echo "$as_me:15861: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:20971: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15867 "configure"
+#line 20977 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -15873,22 +20983,24 @@ else
 int
 main ()
 {
-struct tm *tp;
+if ((struct tm *) 0)
+return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15885: \$? = $ac_status" >&5
+  echo "$as_me:20996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15887: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:20999: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15890: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21002: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -15897,7 +21009,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15900: result: $ac_cv_header_time" >&5
+echo "$as_me:21012: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -15907,13 +21019,13 @@ EOF
 
 fi
 
-echo "$as_me:15910: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:21022: checking whether struct tm is in sys/time.h or time.h" >&5
 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
 if test "${ac_cv_struct_tm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15916 "configure"
+#line 21028 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -15927,16 +21039,17 @@ struct tm *tp; tp->tm_sec;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15933: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:15935: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:21048: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15938: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21051: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_struct_tm=time.h
 else
   echo "$as_me: failed program was:" >&5
@@ -15945,7 +21058,7 @@ ac_cv_struct_tm=sys/time.h
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:15948: result: $ac_cv_struct_tm" >&5
+echo "$as_me:21061: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
 
@@ -15955,13 +21068,13 @@ EOF
 
 fi
 
-echo "$as_me:15958: checking for ANSI C header files" >&5
+echo "$as_me:21071: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15964 "configure"
+#line 21077 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -15969,14 +21082,14 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:15972: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:21085: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:15978: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21091: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -15997,7 +21110,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 16000 "configure"
+#line 21113 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -16015,7 +21128,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 16018 "configure"
+#line 21131 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -16036,7 +21149,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16039 "configure"
+#line 21152 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -16062,15 +21175,16 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16068: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:16069: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:21181: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:21183: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16072: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21186: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -16078,11 +21192,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_header_stdc=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:16085: result: $ac_cv_header_stdc" >&5
+echo "$as_me:21199: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -16101,20 +21215,18 @@ for ac_header in \
 	bsdsetjmp.h				\
 	crypt.h					\
 	curses.h				\
-	dbm.h					\
 	dirent.h				\
 	dlfcn.h					\
 	err.h					\
 	errno.h					\
 	fcntl.h					\
 	fnmatch.h				\
-	gdbm/ndbm.h				\
 	grp.h					\
 	inttypes.h				\
 	io.h					\
+	libutil.h				\
 	limits.h				\
 	maillock.h				\
-	ndbm.h					\
 	net/if.h				\
 	netdb.h					\
 	netinet/in.h				\
@@ -16129,7 +21241,6 @@ for ac_header in \
 	pty.h					\
 	pwd.h					\
 	resolv.h				\
-	rpcsvc/dbm.h				\
 	sac.h					\
 	security/pam_modules.h			\
 	sgtty.h					\
@@ -16184,25 +21295,25 @@ for ac_header in \
 	utmpx.h					\
 
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:16188: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:21299: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16194 "configure"
+#line 21305 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16198: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:21309: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16204: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21315: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -16212,19 +21323,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16223: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:21334: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -16232,25 +21343,25 @@ done
 
 for ac_header in standards.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:16236: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:21347: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16242 "configure"
+#line 21353 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16246: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:21357: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16252: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21363: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -16260,19 +21371,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16271: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:21382: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -16282,13 +21393,13 @@ for i in netinet/ip.h netinet/tcp.h; do
 
 cv=`echo "$i" | sed 'y%./+-%__p_%'`
 
-echo "$as_me:16285: checking for $i" >&5
+echo "$as_me:21396: checking for $i" >&5
 echo $ECHO_N "checking for $i... $ECHO_C" >&6
 if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16291 "configure"
+#line 21402 "configure"
 #include "confdefs.h"
 \
 #ifdef HAVE_STANDARDS_H
@@ -16297,14 +21408,14 @@ else
 #include <$i>
 
 _ACEOF
-if { (eval echo "$as_me:16300: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:21411: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16306: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21417: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -16322,7 +21433,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16325: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+echo "$as_me:21436: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
 echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
 ac_res=`eval echo \\$ac_cv_header_$cv`
 if test "$ac_res" = yes; then
@@ -16337,25 +21448,25 @@ if false;then
 
 for ac_header in netinet/ip.h netinet/tcp.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:16341: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:21452: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16347 "configure"
+#line 21458 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16351: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:21462: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:16357: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:21468: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -16365,19 +21476,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16376: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:21487: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -16415,6 +21526,516 @@ else
   have_fnmatch_h_FALSE=
 fi
 
+echo "$as_me:21529: checking for socket" >&5
+echo $ECHO_N "checking for socket... $ECHO_C" >&6
+if test "${ac_cv_funclib_socket+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_socket\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" socket; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 21547 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+socket()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21559: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21562: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21565: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21568: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_socket"
+
+if false; then
+
+for ac_func in socket
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:21590: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 21596 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21627: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21630: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21633: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21636: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:21646: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# socket
+eval "ac_tr_func=HAVE_`echo socket | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_socket=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_socket=yes"
+	eval "LIB_socket="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:21670: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_socket=no"
+	eval "LIB_socket="
+	echo "$as_me:21676: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_socket=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:21690: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_socket"; then
+	LIBS="$LIB_socket $LIBS"
+fi
+
+echo "$as_me:21699: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" nsl; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 21717 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+gethostbyname()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21729: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21732: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21735: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21738: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_gethostbyname"
+
+if false; then
+
+for ac_func in gethostbyname
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:21760: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 21766 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21797: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21800: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21803: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21806: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:21816: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# gethostbyname
+eval "ac_tr_func=HAVE_`echo gethostbyname | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_gethostbyname=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_gethostbyname=yes"
+	eval "LIB_gethostbyname="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:21840: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_gethostbyname=no"
+	eval "LIB_gethostbyname="
+	echo "$as_me:21846: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_gethostbyname=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:21860: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_gethostbyname"; then
+	LIBS="$LIB_gethostbyname $LIBS"
+fi
+
+echo "$as_me:21869: checking for syslog" >&5
+echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+if test "${ac_cv_funclib_syslog+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+if eval "test \"\$ac_cv_func_syslog\" != yes" ; then
+	ac_save_LIBS="$LIBS"
+	for ac_lib in "" syslog; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
+		LIBS=" $ac_lib  $ac_save_LIBS"
+		cat >conftest.$ac_ext <<_ACEOF
+#line 21887 "configure"
+#include "confdefs.h"
+
+int
+main ()
+{
+syslog()
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21899: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21902: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21905: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21908: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+	done
+	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+	LIBS="$ac_save_LIBS"
+fi
+
+fi
+
+eval "ac_res=\$ac_cv_funclib_syslog"
+
+if false; then
+
+for ac_func in syslog
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:21930: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 21936 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:21967: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:21970: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:21973: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:21976: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:21986: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+fi
+# syslog
+eval "ac_tr_func=HAVE_`echo syslog | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+eval "LIB_syslog=$ac_res"
+
+case "$ac_res" in
+	yes)
+	eval "ac_cv_func_syslog=yes"
+	eval "LIB_syslog="
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	echo "$as_me:22010: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	;;
+	no)
+	eval "ac_cv_func_syslog=no"
+	eval "LIB_syslog="
+	echo "$as_me:22016: result: no" >&5
+echo "${ECHO_T}no" >&6
+	;;
+	*)
+	eval "ac_cv_func_syslog=yes"
+	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
+	cat >>confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+
+	cat >>confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+	echo "$as_me:22030: result: yes, in $ac_res" >&5
+echo "${ECHO_T}yes, in $ac_res" >&6
+	;;
+esac
+
+if test -n "$LIB_syslog"; then
+	LIBS="$LIB_syslog $LIBS"
+fi
+
 # Check whether --with-ipv6 or --without-ipv6 was given.
 if test "${with_ipv6+set}" = set; then
   withval="$with_ipv6"
@@ -16423,19 +22044,20 @@ if test "$withval" = "no"; then
 	ac_cv_lib_ipv6=no
 fi
 fi;
+save_CFLAGS="${CFLAGS}"
 if test "${ac_cv_lib_ipv6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   v6type=unknown
 v6lib=none
 
-echo "$as_me:16432: checking ipv6 stack type" >&5
+echo "$as_me:22054: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 for i in v6d toshiba kame inria zeta linux; do
 	case $i in
 	v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16438 "configure"
+#line 22060 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/types.h>
@@ -16454,7 +22076,7 @@ rm -f conftest*
 		;;
 	toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16457 "configure"
+#line 22079 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16473,7 +22095,7 @@ rm -f conftest*
 		;;
 	kame)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16476 "configure"
+#line 22098 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16492,7 +22114,7 @@ rm -f conftest*
 		;;
 	inria)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16495 "configure"
+#line 22117 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -16509,7 +22131,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16512 "configure"
+#line 22134 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16539,7 +22161,7 @@ rm -f conftest*
 		break
 	fi
 done
-echo "$as_me:16542: result: $v6type" >&5
+echo "$as_me:22164: result: $v6type" >&5
 echo "${ECHO_T}$v6type" >&6
 
 if test "$v6lib" != "none"; then
@@ -16551,7 +22173,7 @@ if test "$v6lib" != "none"; then
 	done
 fi
 cat >conftest.$ac_ext <<_ACEOF
-#line 16554 "configure"
+#line 22176 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -16586,28 +22208,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16592: \$? = $ac_status" >&5
+  echo "$as_me:22214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:16594: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22217: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16597: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:22220: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_ipv6=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_lib_ipv6=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:16608: checking for IPv6" >&5
+echo "$as_me:22231: checking for IPv6" >&5
 echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
-echo "$as_me:16610: result: $ac_cv_lib_ipv6" >&5
+echo "$as_me:22233: result: $ac_cv_lib_ipv6" >&5
 echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
 if test "$ac_cv_lib_ipv6" = yes; then
 
@@ -16615,239 +22238,143 @@ cat >>confdefs.h <<\EOF
 #define HAVE_IPV6 1
 EOF
 
+else
+  CFLAGS="${save_CFLAGS}"
 fi
 
-echo "$as_me:16620: checking for socket" >&5
-echo $ECHO_N "checking for socket... $ECHO_C" >&6
-if test "${ac_cv_funclib_socket+set}" = set; then
+if test "$ac_cv_lib_ipv6" = yes; then
+	echo "$as_me:22246: checking for in6addr_loopback" >&5
+echo $ECHO_N "checking for in6addr_loopback... $ECHO_C" >&6
+if test "${ac_cv_var_in6addr_loopback+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-if eval "test \"\$ac_cv_func_socket\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in "" socket; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS=" $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 16636 "configure"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 22253 "configure"
 #include "confdefs.h"
 
-int
-main ()
-{
-socket()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16648: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16651: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:16653: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:16656: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-eval "ac_res=\$ac_cv_funclib_socket"
-
-if false; then
-
-for ac_func in socket
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16678: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 16684 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
 int
 main ()
 {
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
+
+struct sockaddr_in6 sin6;
+sin6.sin6_addr = in6addr_loopback;
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16718: \$? = $ac_status" >&5
+  echo "$as_me:22283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:16720: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22286: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16723: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:22289: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_var_in6addr_loopback=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+ac_cv_var_in6addr_loopback=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:16733: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-done
-
-fi
-# socket
-eval "ac_tr_func=HAVE_`echo socket | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_socket=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_socket=yes"
-	eval "LIB_socket="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+echo "$as_me:22299: result: $ac_cv_var_in6addr_loopback" >&5
+echo "${ECHO_T}$ac_cv_var_in6addr_loopback" >&6
+	if test "$ac_cv_var_in6addr_loopback" = yes; then
 
-	echo "$as_me:16757: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_socket=no"
-	eval "LIB_socket="
-	echo "$as_me:16763: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_socket=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
+cat >>confdefs.h <<\EOF
+#define HAVE_IN6ADDR_LOOPBACK 1
 EOF
 
-	echo "$as_me:16777: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
-	;;
-esac
-
-if test -n "$LIB_socket"; then
-	LIBS="$LIB_socket $LIBS"
+	fi
 fi
 
-echo "$as_me:16786: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+echo "$as_me:22310: checking for logwtmp" >&5
+echo $ECHO_N "checking for logwtmp... $ECHO_C" >&6
+if test "${ac_cv_funclib_logwtmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
+if eval "test \"\$ac_cv_func_logwtmp\" != yes" ; then
 	ac_save_LIBS="$LIBS"
-	for ac_lib in "" nsl; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+	for ac_lib in "" util; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16802 "configure"
+#line 22328 "configure"
 #include "confdefs.h"
 
 int
 main ()
 {
-gethostbyname()
+logwtmp()
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16817: \$? = $ac_status" >&5
+  echo "$as_me:22343: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:16819: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22346: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16822: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+  echo "$as_me:22349: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
-	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
 	LIBS="$ac_save_LIBS"
 fi
 
 fi
 
-eval "ac_res=\$ac_cv_funclib_gethostbyname"
+eval "ac_res=\$ac_cv_funclib_logwtmp"
 
 if false; then
 
-for ac_func in gethostbyname
+for ac_func in logwtmp
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:16844: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:22371: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16850 "configure"
+#line 22377 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16878,59 +22405,60 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22408: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16884: \$? = $ac_status" >&5
+  echo "$as_me:22411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:16886: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22414: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16889: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:22417: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16899: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:22427: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 fi
-# gethostbyname
-eval "ac_tr_func=HAVE_`echo gethostbyname | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+# logwtmp
+eval "ac_tr_func=HAVE_`echo logwtmp | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_gethostbyname=$ac_res"
+eval "LIB_logwtmp=$ac_res"
 
 case "$ac_res" in
 	yes)
-	eval "ac_cv_func_gethostbyname=yes"
-	eval "LIB_gethostbyname="
+	eval "ac_cv_func_logwtmp=yes"
+	eval "LIB_logwtmp="
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:16923: result: yes" >&5
+	echo "$as_me:22451: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
-	eval "ac_cv_func_gethostbyname=no"
-	eval "LIB_gethostbyname="
-	echo "$as_me:16929: result: no" >&5
+	eval "ac_cv_func_logwtmp=no"
+	eval "LIB_logwtmp="
+	echo "$as_me:22457: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
-	eval "ac_cv_func_gethostbyname=yes"
+	eval "ac_cv_func_logwtmp=yes"
 	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
@@ -16940,80 +22468,79 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:16943: result: yes, in $ac_res" >&5
+	echo "$as_me:22471: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-if test -n "$LIB_gethostbyname"; then
-	LIBS="$LIB_gethostbyname $LIBS"
-fi
-
-echo "$as_me:16952: checking for syslog" >&5
-echo $ECHO_N "checking for syslog... $ECHO_C" >&6
-if test "${ac_cv_funclib_syslog+set}" = set; then
+echo "$as_me:22476: checking for logout" >&5
+echo $ECHO_N "checking for logout... $ECHO_C" >&6
+if test "${ac_cv_funclib_logout+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-if eval "test \"\$ac_cv_func_syslog\" != yes" ; then
+if eval "test \"\$ac_cv_func_logout\" != yes" ; then
 	ac_save_LIBS="$LIBS"
-	for ac_lib in "" syslog; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+	for ac_lib in "" util; do
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16968 "configure"
+#line 22494 "configure"
 #include "confdefs.h"
 
 int
 main ()
 {
-syslog()
+logout()
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16983: \$? = $ac_status" >&5
+  echo "$as_me:22509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:16985: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22512: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16988: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+  echo "$as_me:22515: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logout=$ac_lib; else ac_cv_funclib_logout=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
-	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+	eval "ac_cv_funclib_logout=\${ac_cv_funclib_logout-no}"
 	LIBS="$ac_save_LIBS"
 fi
 
 fi
 
-eval "ac_res=\$ac_cv_funclib_syslog"
+eval "ac_res=\$ac_cv_funclib_logout"
 
 if false; then
 
-for ac_func in syslog
+for ac_func in logout
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17010: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:22537: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17016 "configure"
+#line 22543 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17044,59 +22571,60 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17050: \$? = $ac_status" >&5
+  echo "$as_me:22577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17052: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22580: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17055: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:22583: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17065: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:22593: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 fi
-# syslog
-eval "ac_tr_func=HAVE_`echo syslog | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+# logout
+eval "ac_tr_func=HAVE_`echo logout | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_syslog=$ac_res"
+eval "LIB_logout=$ac_res"
 
 case "$ac_res" in
 	yes)
-	eval "ac_cv_func_syslog=yes"
-	eval "LIB_syslog="
+	eval "ac_cv_func_logout=yes"
+	eval "LIB_logout="
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17089: result: yes" >&5
+	echo "$as_me:22617: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
-	eval "ac_cv_func_syslog=no"
-	eval "LIB_syslog="
-	echo "$as_me:17095: result: no" >&5
+	eval "ac_cv_func_logout=no"
+	eval "LIB_logout="
+	echo "$as_me:22623: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
-	eval "ac_cv_func_syslog=yes"
+	eval "ac_cv_func_logout=yes"
 	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
@@ -17106,80 +22634,79 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17109: result: yes, in $ac_res" >&5
+	echo "$as_me:22637: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-if test -n "$LIB_syslog"; then
-	LIBS="$LIB_syslog $LIBS"
-fi
-
-echo "$as_me:17118: checking for logwtmp" >&5
-echo $ECHO_N "checking for logwtmp... $ECHO_C" >&6
-if test "${ac_cv_funclib_logwtmp+set}" = set; then
+echo "$as_me:22642: checking for openpty" >&5
+echo $ECHO_N "checking for openpty... $ECHO_C" >&6
+if test "${ac_cv_funclib_openpty+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-if eval "test \"\$ac_cv_func_logwtmp\" != yes" ; then
+if eval "test \"\$ac_cv_func_openpty\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" util; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17134 "configure"
+#line 22660 "configure"
 #include "confdefs.h"
 
 int
 main ()
 {
-logwtmp()
+openpty()
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17149: \$? = $ac_status" >&5
+  echo "$as_me:22675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17151: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22678: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17154: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
+  echo "$as_me:22681: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_openpty=$ac_lib; else ac_cv_funclib_openpty=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
-	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
+	eval "ac_cv_funclib_openpty=\${ac_cv_funclib_openpty-no}"
 	LIBS="$ac_save_LIBS"
 fi
 
 fi
 
-eval "ac_res=\$ac_cv_funclib_logwtmp"
+eval "ac_res=\$ac_cv_funclib_openpty"
 
 if false; then
 
-for ac_func in logwtmp
+for ac_func in openpty
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17176: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:22703: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17182 "configure"
+#line 22709 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17210,59 +22737,60 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17216: \$? = $ac_status" >&5
+  echo "$as_me:22743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17218: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22746: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17221: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:22749: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17231: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:22759: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
 fi
-# logwtmp
-eval "ac_tr_func=HAVE_`echo logwtmp | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+# openpty
+eval "ac_tr_func=HAVE_`echo openpty | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_logwtmp=$ac_res"
+eval "LIB_openpty=$ac_res"
 
 case "$ac_res" in
 	yes)
-	eval "ac_cv_func_logwtmp=yes"
-	eval "LIB_logwtmp="
+	eval "ac_cv_func_openpty=yes"
+	eval "LIB_openpty="
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17255: result: yes" >&5
+	echo "$as_me:22783: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
-	eval "ac_cv_func_logwtmp=no"
-	eval "LIB_logwtmp="
-	echo "$as_me:17261: result: no" >&5
+	eval "ac_cv_func_openpty=no"
+	eval "LIB_openpty="
+	echo "$as_me:22789: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
-	eval "ac_cv_func_logwtmp=yes"
+	eval "ac_cv_func_openpty=yes"
 	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
 	cat >>confdefs.h <<EOF
 #define $ac_tr_func 1
@@ -17272,12 +22800,12 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17275: result: yes, in $ac_res" >&5
+	echo "$as_me:22803: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:17280: checking for tgetent" >&5
+echo "$as_me:22808: checking for tgetent" >&5
 echo $ECHO_N "checking for tgetent... $ECHO_C" >&6
 if test "${ac_cv_funclib_tgetent+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17286,14 +22814,16 @@ else
 if eval "test \"\$ac_cv_func_tgetent\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" termcap ncurses curses; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17296 "configure"
+#line 22826 "configure"
 #include "confdefs.h"
 
 int
@@ -17305,22 +22835,23 @@ tgetent()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17308: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17311: \$? = $ac_status" >&5
+  echo "$as_me:22841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17313: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22844: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17316: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:22847: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_tgetent=\${ac_cv_funclib_tgetent-no}"
 	LIBS="$ac_save_LIBS"
@@ -17334,14 +22865,14 @@ if false; then
 
 for ac_func in tgetent
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17338: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:22869: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17344 "configure"
+#line 22875 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17372,29 +22903,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22906: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17378: \$? = $ac_status" >&5
+  echo "$as_me:22909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17380: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:22912: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17383: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:22915: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17393: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:22925: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -17414,13 +22946,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17417: result: yes" >&5
+	echo "$as_me:22949: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_tgetent=no"
 	eval "LIB_tgetent="
-	echo "$as_me:17423: result: no" >&5
+	echo "$as_me:22955: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -17434,12 +22966,12 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17437: result: yes, in $ac_res" >&5
+	echo "$as_me:22969: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:17442: checking for gethostbyname2" >&5
+echo "$as_me:22974: checking for gethostbyname2" >&5
 echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
 if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17448,14 +22980,16 @@ else
 if eval "test \"\$ac_cv_func_gethostbyname2\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" inet6 ip6; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17458 "configure"
+#line 22992 "configure"
 #include "confdefs.h"
 
 int
@@ -17467,22 +23001,23 @@ gethostbyname2()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23004: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17473: \$? = $ac_status" >&5
+  echo "$as_me:23007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17475: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23010: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17478: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23013: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
 	LIBS="$ac_save_LIBS"
@@ -17496,14 +23031,14 @@ if false; then
 
 for ac_func in gethostbyname2
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17500: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:23035: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17506 "configure"
+#line 23041 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17534,29 +23069,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17540: \$? = $ac_status" >&5
+  echo "$as_me:23075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17542: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23078: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17545: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:23081: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17555: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:23091: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -17576,13 +23112,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17579: result: yes" >&5
+	echo "$as_me:23115: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_gethostbyname2=no"
 	eval "LIB_gethostbyname2="
-	echo "$as_me:17585: result: no" >&5
+	echo "$as_me:23121: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -17596,7 +23132,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17599: result: yes, in $ac_res" >&5
+	echo "$as_me:23135: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -17605,7 +23141,7 @@ if test -n "$LIB_gethostbyname2"; then
 	LIBS="$LIB_gethostbyname2 $LIBS"
 fi
 
-echo "$as_me:17608: checking for res_search" >&5
+echo "$as_me:23144: checking for res_search" >&5
 echo $ECHO_N "checking for res_search... $ECHO_C" >&6
 if test "${ac_cv_funclib_res_search+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17614,14 +23150,16 @@ else
 if eval "test \"\$ac_cv_func_res_search\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17624 "configure"
+#line 23162 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17647,22 +23185,23 @@ res_search(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17653: \$? = $ac_status" >&5
+  echo "$as_me:23191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17655: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17658: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23197: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
 	LIBS="$ac_save_LIBS"
@@ -17676,14 +23215,14 @@ if false; then
 
 for ac_func in res_search
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17680: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:23219: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17686 "configure"
+#line 23225 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17714,29 +23253,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17720: \$? = $ac_status" >&5
+  echo "$as_me:23259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17722: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23262: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17725: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:23265: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17735: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:23275: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -17756,13 +23296,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17759: result: yes" >&5
+	echo "$as_me:23299: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_res_search=no"
 	eval "LIB_res_search="
-	echo "$as_me:17765: result: no" >&5
+	echo "$as_me:23305: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -17776,7 +23316,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17779: result: yes, in $ac_res" >&5
+	echo "$as_me:23319: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -17785,7 +23325,7 @@ if test -n "$LIB_res_search"; then
 	LIBS="$LIB_res_search $LIBS"
 fi
 
-echo "$as_me:17788: checking for dn_expand" >&5
+echo "$as_me:23328: checking for dn_expand" >&5
 echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
 if test "${ac_cv_funclib_dn_expand+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17794,14 +23334,16 @@ else
 if eval "test \"\$ac_cv_func_dn_expand\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" resolv; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17804 "configure"
+#line 23346 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17827,22 +23369,23 @@ dn_expand(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17833: \$? = $ac_status" >&5
+  echo "$as_me:23375: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17835: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23378: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17838: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23381: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
 	LIBS="$ac_save_LIBS"
@@ -17856,14 +23399,14 @@ if false; then
 
 for ac_func in dn_expand
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:17860: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:23403: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17866 "configure"
+#line 23409 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17894,29 +23437,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17900: \$? = $ac_status" >&5
+  echo "$as_me:23443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:17902: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23446: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17905: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:23449: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17915: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:23459: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -17936,13 +23480,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:17939: result: yes" >&5
+	echo "$as_me:23483: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_dn_expand=no"
 	eval "LIB_dn_expand="
-	echo "$as_me:17945: result: no" >&5
+	echo "$as_me:23489: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -17956,7 +23500,7 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:17959: result: yes, in $ac_res" >&5
+	echo "$as_me:23503: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
@@ -17965,7 +23509,7 @@ if test -n "$LIB_dn_expand"; then
 	LIBS="$LIB_dn_expand $LIBS"
 fi
 
-echo "$as_me:17968: checking for working snprintf" >&5
+echo "$as_me:23512: checking for working snprintf" >&5
 echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
 if test "${ac_cv_func_snprintf_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17975,7 +23519,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17978 "configure"
+#line 23522 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17988,15 +23532,16 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17994: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:17995: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:23538: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:23540: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17998: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23543: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -18004,10 +23549,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_snprintf_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:18010: result: $ac_cv_func_snprintf_working" >&5
+echo "$as_me:23555: result: $ac_cv_func_snprintf_working" >&5
 echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
 
 if test "$ac_cv_func_snprintf_working" = yes; then
@@ -18020,13 +23565,13 @@ fi
 if test "$ac_cv_func_snprintf_working" = yes; then
 
 if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
-echo "$as_me:18023: checking if snprintf needs a prototype" >&5
+echo "$as_me:23568: checking if snprintf needs a prototype" >&5
 echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_snprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18029 "configure"
+#line 23574 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18041,16 +23586,17 @@ snprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18047: \$? = $ac_status" >&5
+  echo "$as_me:23592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18049: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:23595: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18052: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23598: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_snprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -18059,7 +23605,7 @@ eval "ac_cv_func_snprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:18062: result: $ac_cv_func_snprintf_noproto" >&5
+echo "$as_me:23608: result: $ac_cv_func_snprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
 
 if test "$ac_cv_func_snprintf_noproto" = yes; then
@@ -18074,7 +23620,7 @@ fi
 
 fi
 
-echo "$as_me:18077: checking for working vsnprintf" >&5
+echo "$as_me:23623: checking for working vsnprintf" >&5
 echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
 if test "${ac_cv_func_vsnprintf_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18084,7 +23630,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18087 "configure"
+#line 23633 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18107,15 +23653,16 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18113: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:18114: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:23659: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:23661: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23664: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -18123,10 +23670,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_vsnprintf_working=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:18129: result: $ac_cv_func_vsnprintf_working" >&5
+echo "$as_me:23676: result: $ac_cv_func_vsnprintf_working" >&5
 echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
 
 if test "$ac_cv_func_vsnprintf_working" = yes; then
@@ -18139,13 +23686,13 @@ fi
 if test "$ac_cv_func_vsnprintf_working" = yes; then
 
 if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
-echo "$as_me:18142: checking if vsnprintf needs a prototype" >&5
+echo "$as_me:23689: checking if vsnprintf needs a prototype" >&5
 echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
 if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18148 "configure"
+#line 23695 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18160,16 +23707,17 @@ vsnprintf(&xx);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18166: \$? = $ac_status" >&5
+  echo "$as_me:23713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18168: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:23716: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18171: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23719: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_func_vsnprintf_noproto=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -18178,7 +23726,7 @@ eval "ac_cv_func_vsnprintf_noproto=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:18181: result: $ac_cv_func_vsnprintf_noproto" >&5
+echo "$as_me:23729: result: $ac_cv_func_vsnprintf_noproto" >&5
 echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
 
 if test "$ac_cv_func_vsnprintf_noproto" = yes; then
@@ -18227,14 +23775,14 @@ for ac_func in 				\
 	yp_get_default_domain			\
 
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18231: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:23779: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18237 "configure"
+#line 23785 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18265,29 +23813,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18271: \$? = $ac_status" >&5
+  echo "$as_me:23819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18273: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23822: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18276: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:23825: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18286: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:23835: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -18295,25 +23844,25 @@ done
 
 for ac_header in capability.h sys/capability.h
 do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:18299: checking for $ac_header" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:23848: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18305 "configure"
+#line 23854 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18309: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+if { (eval echo "$as_me:23858: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:18315: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:23864: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
   else
@@ -18323,19 +23872,19 @@ else
   ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18334: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+echo "$as_me:23883: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -18343,14 +23892,14 @@ done
 
 for ac_func in sgi_getcapabilitybyname cap_set_proc
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18347: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:23896: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18353 "configure"
+#line 23902 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18381,35 +23930,36 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23933: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18387: \$? = $ac_status" >&5
+  echo "$as_me:23936: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18389: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23939: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18392: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:23942: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18402: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:23952: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
-echo "$as_me:18412: checking for getpwnam_r" >&5
+echo "$as_me:23962: checking for getpwnam_r" >&5
 echo $ECHO_N "checking for getpwnam_r... $ECHO_C" >&6
 if test "${ac_cv_funclib_getpwnam_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18418,14 +23968,16 @@ else
 if eval "test \"\$ac_cv_func_getpwnam_r\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" c_r; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18428 "configure"
+#line 23980 "configure"
 #include "confdefs.h"
 
 int
@@ -18437,22 +23989,23 @@ getpwnam_r()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18443: \$? = $ac_status" >&5
+  echo "$as_me:23995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18445: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:23998: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18448: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24001: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getpwnam_r=$ac_lib; else ac_cv_funclib_getpwnam_r=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_getpwnam_r=\${ac_cv_funclib_getpwnam_r-no}"
 	LIBS="$ac_save_LIBS"
@@ -18466,14 +24019,14 @@ if false; then
 
 for ac_func in getpwnam_r
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18470: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:24023: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18476 "configure"
+#line 24029 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18504,29 +24057,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18510: \$? = $ac_status" >&5
+  echo "$as_me:24063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18512: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24066: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18515: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:24069: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18525: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:24079: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -18546,13 +24100,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:18549: result: yes" >&5
+	echo "$as_me:24103: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_getpwnam_r=no"
 	eval "LIB_getpwnam_r="
-	echo "$as_me:18555: result: no" >&5
+	echo "$as_me:24109: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -18566,13 +24120,13 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:18569: result: yes, in $ac_res" >&5
+	echo "$as_me:24123: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
 if test "$ac_cv_func_getpwnam_r" = yes; then
-	echo "$as_me:18575: checking if getpwnam_r is posix" >&5
+	echo "$as_me:24129: checking if getpwnam_r is posix" >&5
 echo $ECHO_N "checking if getpwnam_r is posix... $ECHO_C" >&6
 if test "${ac_cv_func_getpwnam_r_posix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18583,7 +24137,7 @@ else
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18586 "configure"
+#line 24140 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -18595,15 +24149,16 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18601: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:18602: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:24155: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:24157: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18605: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24160: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_getpwnam_r_posix=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -18611,11 +24166,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_getpwnam_r_posix=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 LIBS="$ac_libs"
 fi
-echo "$as_me:18618: result: $ac_cv_func_getpwnam_r_posix" >&5
+echo "$as_me:24173: result: $ac_cv_func_getpwnam_r_posix" >&5
 echo "${ECHO_T}$ac_cv_func_getpwnam_r_posix" >&6
 if test "$ac_cv_func_getpwnam_r_posix" = yes; then
 
@@ -18626,7 +24181,7 @@ EOF
 fi
 fi
 
-echo "$as_me:18629: checking for getsockopt" >&5
+echo "$as_me:24184: checking for getsockopt" >&5
 echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
 if test "${ac_cv_funclib_getsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18635,14 +24190,16 @@ else
 if eval "test \"\$ac_cv_func_getsockopt\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18645 "configure"
+#line 24202 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -18659,22 +24216,23 @@ getsockopt(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18665: \$? = $ac_status" >&5
+  echo "$as_me:24222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18667: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24225: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18670: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24228: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
 	LIBS="$ac_save_LIBS"
@@ -18688,14 +24246,14 @@ if false; then
 
 for ac_func in getsockopt
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18692: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:24250: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18698 "configure"
+#line 24256 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18726,29 +24284,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18732: \$? = $ac_status" >&5
+  echo "$as_me:24290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18734: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24293: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18737: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:24296: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18747: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:24306: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -18768,13 +24327,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:18771: result: yes" >&5
+	echo "$as_me:24330: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_getsockopt=no"
 	eval "LIB_getsockopt="
-	echo "$as_me:18777: result: no" >&5
+	echo "$as_me:24336: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -18788,12 +24347,12 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:18791: result: yes, in $ac_res" >&5
+	echo "$as_me:24350: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
-echo "$as_me:18796: checking for setsockopt" >&5
+echo "$as_me:24355: checking for setsockopt" >&5
 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_funclib_setsockopt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18802,14 +24361,16 @@ else
 if eval "test \"\$ac_cv_func_setsockopt\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" ; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib  $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18812 "configure"
+#line 24373 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -18826,22 +24387,23 @@ setsockopt(0,0,0,0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18832: \$? = $ac_status" >&5
+  echo "$as_me:24393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18834: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24396: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18837: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24399: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
 	LIBS="$ac_save_LIBS"
@@ -18855,14 +24417,14 @@ if false; then
 
 for ac_func in setsockopt
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18859: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:24421: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18865 "configure"
+#line 24427 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -18893,29 +24455,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18899: \$? = $ac_status" >&5
+  echo "$as_me:24461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:18901: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24464: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18904: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:24467: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18914: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:24477: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -18935,13 +24498,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:18938: result: yes" >&5
+	echo "$as_me:24501: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_setsockopt=no"
 	eval "LIB_setsockopt="
-	echo "$as_me:18944: result: no" >&5
+	echo "$as_me:24507: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -18955,21 +24518,21 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:18958: result: yes, in $ac_res" >&5
+	echo "$as_me:24521: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
 for ac_func in getudbnam setlim
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:18966: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:24529: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18972 "configure"
+#line 24535 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -19000,41 +24563,42 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19006: \$? = $ac_status" >&5
+  echo "$as_me:24569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19008: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:24572: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19011: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:24575: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19021: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:24585: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
 done
 
-echo "$as_me:19031: checking return type of signal handlers" >&5
+echo "$as_me:24595: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19037 "configure"
+#line 24601 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -19056,16 +24620,17 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19062: \$? = $ac_status" >&5
+  echo "$as_me:24626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19064: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24629: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19067: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24632: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
   echo "$as_me: failed program was:" >&5
@@ -19074,7 +24639,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19077: result: $ac_cv_type_signal" >&5
+echo "$as_me:24642: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -19089,7 +24654,7 @@ EOF
 
 fi
 
-echo "$as_me:19092: checking if realloc if broken" >&5
+echo "$as_me:24657: checking if realloc if broken" >&5
 echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
 if test "${ac_cv_func_realloc_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19100,7 +24665,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19103 "configure"
+#line 24668 "configure"
 #include "confdefs.h"
 
 #include <stddef.h>
@@ -19113,15 +24678,16 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19119: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:19120: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:24684: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:24686: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19123: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24689: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -19129,11 +24695,11 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_realloc_broken=yes
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:19136: result: $ac_cv_func_realloc_broken" >&5
+echo "$as_me:24702: result: $ac_cv_func_realloc_broken" >&5
 echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
 if test "$ac_cv_func_realloc_broken" = yes ; then
 
@@ -19143,14 +24709,14 @@ EOF
 
 fi
 
-echo "$as_me:19146: checking for ut_addr in struct utmp" >&5
+echo "$as_me:24712: checking for ut_addr in struct utmp" >&5
 echo $ECHO_N "checking for ut_addr in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19153 "configure"
+#line 24719 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19162,16 +24728,17 @@ struct utmp x; x.ut_addr;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19168: \$? = $ac_status" >&5
+  echo "$as_me:24734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19170: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24737: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19173: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24740: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_addr=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19180,7 +24747,7 @@ ac_cv_type_struct_utmp_ut_addr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19183: result: $ac_cv_type_struct_utmp_ut_addr" >&5
+echo "$as_me:24750: result: $ac_cv_type_struct_utmp_ut_addr" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_addr" >&6
 if test "$ac_cv_type_struct_utmp_ut_addr" = yes; then
 
@@ -19190,14 +24757,14 @@ EOF
 
 fi
 
-echo "$as_me:19193: checking for ut_host in struct utmp" >&5
+echo "$as_me:24760: checking for ut_host in struct utmp" >&5
 echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19200 "configure"
+#line 24767 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19209,16 +24776,17 @@ struct utmp x; x.ut_host;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19215: \$? = $ac_status" >&5
+  echo "$as_me:24782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19217: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24785: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19220: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24788: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_host=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19227,7 +24795,7 @@ ac_cv_type_struct_utmp_ut_host=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19230: result: $ac_cv_type_struct_utmp_ut_host" >&5
+echo "$as_me:24798: result: $ac_cv_type_struct_utmp_ut_host" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_host" >&6
 if test "$ac_cv_type_struct_utmp_ut_host" = yes; then
 
@@ -19237,14 +24805,14 @@ EOF
 
 fi
 
-echo "$as_me:19240: checking for ut_id in struct utmp" >&5
+echo "$as_me:24808: checking for ut_id in struct utmp" >&5
 echo $ECHO_N "checking for ut_id in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_id+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19247 "configure"
+#line 24815 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19256,16 +24824,17 @@ struct utmp x; x.ut_id;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19262: \$? = $ac_status" >&5
+  echo "$as_me:24830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19264: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24833: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19267: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24836: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_id=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19274,7 +24843,7 @@ ac_cv_type_struct_utmp_ut_id=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19277: result: $ac_cv_type_struct_utmp_ut_id" >&5
+echo "$as_me:24846: result: $ac_cv_type_struct_utmp_ut_id" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_id" >&6
 if test "$ac_cv_type_struct_utmp_ut_id" = yes; then
 
@@ -19284,14 +24853,14 @@ EOF
 
 fi
 
-echo "$as_me:19287: checking for ut_pid in struct utmp" >&5
+echo "$as_me:24856: checking for ut_pid in struct utmp" >&5
 echo $ECHO_N "checking for ut_pid in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_pid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19294 "configure"
+#line 24863 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19303,16 +24872,17 @@ struct utmp x; x.ut_pid;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19309: \$? = $ac_status" >&5
+  echo "$as_me:24878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19311: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24881: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19314: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24884: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_pid=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19321,7 +24891,7 @@ ac_cv_type_struct_utmp_ut_pid=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19324: result: $ac_cv_type_struct_utmp_ut_pid" >&5
+echo "$as_me:24894: result: $ac_cv_type_struct_utmp_ut_pid" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_pid" >&6
 if test "$ac_cv_type_struct_utmp_ut_pid" = yes; then
 
@@ -19331,14 +24901,14 @@ EOF
 
 fi
 
-echo "$as_me:19334: checking for ut_type in struct utmp" >&5
+echo "$as_me:24904: checking for ut_type in struct utmp" >&5
 echo $ECHO_N "checking for ut_type in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19341 "configure"
+#line 24911 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19350,16 +24920,17 @@ struct utmp x; x.ut_type;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19353: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19356: \$? = $ac_status" >&5
+  echo "$as_me:24926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19358: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24929: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19361: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24932: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_type=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19368,7 +24939,7 @@ ac_cv_type_struct_utmp_ut_type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19371: result: $ac_cv_type_struct_utmp_ut_type" >&5
+echo "$as_me:24942: result: $ac_cv_type_struct_utmp_ut_type" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_type" >&6
 if test "$ac_cv_type_struct_utmp_ut_type" = yes; then
 
@@ -19378,14 +24949,14 @@ EOF
 
 fi
 
-echo "$as_me:19381: checking for ut_user in struct utmp" >&5
+echo "$as_me:24952: checking for ut_user in struct utmp" >&5
 echo $ECHO_N "checking for ut_user in struct utmp... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmp_ut_user+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19388 "configure"
+#line 24959 "configure"
 #include "confdefs.h"
 #include <utmp.h>
 int
@@ -19397,16 +24968,17 @@ struct utmp x; x.ut_user;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19403: \$? = $ac_status" >&5
+  echo "$as_me:24974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19405: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:24977: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19408: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:24980: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmp_ut_user=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19415,7 +24987,7 @@ ac_cv_type_struct_utmp_ut_user=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19418: result: $ac_cv_type_struct_utmp_ut_user" >&5
+echo "$as_me:24990: result: $ac_cv_type_struct_utmp_ut_user" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_user" >&6
 if test "$ac_cv_type_struct_utmp_ut_user" = yes; then
 
@@ -19425,14 +24997,14 @@ EOF
 
 fi
 
-echo "$as_me:19428: checking for ut_exit in struct utmpx" >&5
+echo "$as_me:25000: checking for ut_exit in struct utmpx" >&5
 echo $ECHO_N "checking for ut_exit in struct utmpx... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmpx_ut_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19435 "configure"
+#line 25007 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 int
@@ -19444,16 +25016,17 @@ struct utmpx x; x.ut_exit;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19450: \$? = $ac_status" >&5
+  echo "$as_me:25022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19452: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25025: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19455: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25028: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmpx_ut_exit=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19462,7 +25035,7 @@ ac_cv_type_struct_utmpx_ut_exit=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19465: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
+echo "$as_me:25038: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_exit" >&6
 if test "$ac_cv_type_struct_utmpx_ut_exit" = yes; then
 
@@ -19472,14 +25045,14 @@ EOF
 
 fi
 
-echo "$as_me:19475: checking for ut_syslen in struct utmpx" >&5
+echo "$as_me:25048: checking for ut_syslen in struct utmpx" >&5
 echo $ECHO_N "checking for ut_syslen in struct utmpx... $ECHO_C" >&6
 if test "${ac_cv_type_struct_utmpx_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19482 "configure"
+#line 25055 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
 int
@@ -19491,16 +25064,17 @@ struct utmpx x; x.ut_syslen;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19497: \$? = $ac_status" >&5
+  echo "$as_me:25070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19499: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25073: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19502: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25076: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_utmpx_ut_syslen=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19509,7 +25083,7 @@ ac_cv_type_struct_utmpx_ut_syslen=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19512: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
+echo "$as_me:25086: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
 echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_syslen" >&6
 if test "$ac_cv_type_struct_utmpx_ut_syslen" = yes; then
 
@@ -19519,14 +25093,14 @@ EOF
 
 fi
 
-echo "$as_me:19522: checking for tm_gmtoff in struct tm" >&5
+echo "$as_me:25096: checking for tm_gmtoff in struct tm" >&5
 echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
 if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19529 "configure"
+#line 25103 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -19538,16 +25112,17 @@ struct tm x; x.tm_gmtoff;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19544: \$? = $ac_status" >&5
+  echo "$as_me:25118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19546: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25121: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19549: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25124: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_tm_tm_gmtoff=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19556,7 +25131,7 @@ ac_cv_type_struct_tm_tm_gmtoff=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19559: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+echo "$as_me:25134: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
 echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
 if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
 
@@ -19566,14 +25141,14 @@ EOF
 
 fi
 
-echo "$as_me:19569: checking for tm_zone in struct tm" >&5
+echo "$as_me:25144: checking for tm_zone in struct tm" >&5
 echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
 if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19576 "configure"
+#line 25151 "configure"
 #include "confdefs.h"
 #include <time.h>
 int
@@ -19585,16 +25160,17 @@ struct tm x; x.tm_zone;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25163: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19591: \$? = $ac_status" >&5
+  echo "$as_me:25166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19593: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25169: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19596: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25172: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_tm_tm_zone=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19603,7 +25179,7 @@ ac_cv_type_struct_tm_tm_zone=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19606: result: $ac_cv_type_struct_tm_tm_zone" >&5
+echo "$as_me:25182: result: $ac_cv_type_struct_tm_tm_zone" >&5
 echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
 if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
 
@@ -19613,14 +25189,14 @@ EOF
 
 fi
 
-echo "$as_me:19616: checking for timezone" >&5
+echo "$as_me:25192: checking for timezone" >&5
 echo $ECHO_N "checking for timezone... $ECHO_C" >&6
 if test "${ac_cv_var_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19623 "configure"
+#line 25199 "configure"
 #include "confdefs.h"
 extern int timezone;
 int foo() { return timezone; }
@@ -19633,28 +25209,29 @@ foo()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19639: \$? = $ac_status" >&5
+  echo "$as_me:25215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19641: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:25218: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19644: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25221: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_var_timezone=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_var_timezone=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 ac_foo=`eval echo \\$ac_cv_var_timezone`
-echo "$as_me:19657: result: $ac_foo" >&5
+echo "$as_me:25234: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
 
@@ -19662,14 +25239,14 @@ cat >>confdefs.h <<EOF
 #define HAVE_TIMEZONE 1
 EOF
 
-echo "$as_me:19665: checking if timezone is properly declared" >&5
+echo "$as_me:25242: checking if timezone is properly declared" >&5
 echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
 if test "${ac_cv_var_timezone_declaration+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19672 "configure"
+#line 25249 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern struct { int foo; } timezone;
@@ -19682,16 +25259,17 @@ timezone.foo = 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19688: \$? = $ac_status" >&5
+  echo "$as_me:25265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19690: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25268: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19693: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25271: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_var_timezone_declaration=no"
 else
   echo "$as_me: failed program was:" >&5
@@ -19702,7 +25280,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:19705: result: $ac_cv_var_timezone_declaration" >&5
+echo "$as_me:25283: result: $ac_cv_var_timezone_declaration" >&5
 echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
 if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
 
@@ -19715,13 +25293,13 @@ fi
 fi
 
 cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
-echo "$as_me:19718: checking for sa_family_t" >&5
+echo "$as_me:25296: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19724 "configure"
+#line 25302 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -19738,16 +25316,17 @@ sa_family_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19744: \$? = $ac_status" >&5
+  echo "$as_me:25322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19746: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25325: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19749: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25328: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -19757,18 +25336,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:19760: result: $ac_foo" >&5
+echo "$as_me:25339: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:19765: checking for sa_family_t" >&5
+	echo "$as_me:25344: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if test "${ac_cv_type_sa_family_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19771 "configure"
+#line 25350 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -19783,16 +25362,17 @@ if (sizeof (sa_family_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25365: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19789: \$? = $ac_status" >&5
+  echo "$as_me:25368: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19791: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25371: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19794: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25374: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_sa_family_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19801,7 +25381,7 @@ ac_cv_type_sa_family_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19804: result: $ac_cv_type_sa_family_t" >&5
+echo "$as_me:25384: result: $ac_cv_type_sa_family_t" >&5
 echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
 if test $ac_cv_type_sa_family_t = yes; then
 
@@ -19820,13 +25400,13 @@ EOF
 fi
 
 cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
-echo "$as_me:19823: checking for socklen_t" >&5
+echo "$as_me:25403: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19829 "configure"
+#line 25409 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -19843,16 +25423,17 @@ socklen_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19849: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19851: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25432: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19854: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25435: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -19862,18 +25443,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:19865: result: $ac_foo" >&5
+echo "$as_me:25446: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:19870: checking for socklen_t" >&5
+	echo "$as_me:25451: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${ac_cv_type_socklen_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19876 "configure"
+#line 25457 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -19888,16 +25469,17 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19891: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25472: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19894: \$? = $ac_status" >&5
+  echo "$as_me:25475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19896: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25478: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19899: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25481: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -19906,7 +25488,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19909: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:25491: result: $ac_cv_type_socklen_t" >&5
 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
 if test $ac_cv_type_socklen_t = yes; then
 
@@ -19925,13 +25507,13 @@ EOF
 fi
 
 cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
-echo "$as_me:19928: checking for struct sockaddr" >&5
+echo "$as_me:25510: checking for struct sockaddr" >&5
 echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19934 "configure"
+#line 25516 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -19948,16 +25530,17 @@ struct sockaddr foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19954: \$? = $ac_status" >&5
+  echo "$as_me:25536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:19956: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25539: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19959: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25542: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -19967,18 +25550,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:19970: result: $ac_foo" >&5
+echo "$as_me:25553: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:19975: checking for struct sockaddr" >&5
+	echo "$as_me:25558: checking for struct sockaddr" >&5
 echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19981 "configure"
+#line 25564 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -19993,16 +25576,17 @@ if (sizeof (struct sockaddr))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25579: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19999: \$? = $ac_status" >&5
+  echo "$as_me:25582: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20001: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25585: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20004: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25588: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20011,7 +25595,7 @@ ac_cv_type_struct_sockaddr=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20014: result: $ac_cv_type_struct_sockaddr" >&5
+echo "$as_me:25598: result: $ac_cv_type_struct_sockaddr" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
 if test $ac_cv_type_struct_sockaddr = yes; then
 
@@ -20030,13 +25614,13 @@ EOF
 fi
 
 cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
-echo "$as_me:20033: checking for struct sockaddr_storage" >&5
+echo "$as_me:25617: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20039 "configure"
+#line 25623 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -20053,16 +25637,17 @@ struct sockaddr_storage foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25640: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20059: \$? = $ac_status" >&5
+  echo "$as_me:25643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20061: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25646: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20064: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25649: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -20072,18 +25657,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:20075: result: $ac_foo" >&5
+echo "$as_me:25660: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:20080: checking for struct sockaddr_storage" >&5
+	echo "$as_me:25665: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20086 "configure"
+#line 25671 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -20098,16 +25683,17 @@ if (sizeof (struct sockaddr_storage))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20104: \$? = $ac_status" >&5
+  echo "$as_me:25689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20106: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25692: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20109: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25695: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr_storage=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20116,7 +25702,7 @@ ac_cv_type_struct_sockaddr_storage=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20119: result: $ac_cv_type_struct_sockaddr_storage" >&5
+echo "$as_me:25705: result: $ac_cv_type_struct_sockaddr_storage" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
 if test $ac_cv_type_struct_sockaddr_storage = yes; then
 
@@ -20135,13 +25721,13 @@ EOF
 fi
 
 cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
-echo "$as_me:20138: checking for struct addrinfo" >&5
+echo "$as_me:25724: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20144 "configure"
+#line 25730 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -20158,16 +25744,17 @@ struct addrinfo foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25747: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20164: \$? = $ac_status" >&5
+  echo "$as_me:25750: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20166: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25753: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20169: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25756: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "ac_cv_type_$cv=yes"
 else
   echo "$as_me: failed program was:" >&5
@@ -20177,18 +25764,18 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 ac_foo=`eval echo \\$ac_cv_type_$cv`
-echo "$as_me:20180: result: $ac_foo" >&5
+echo "$as_me:25767: result: $ac_foo" >&5
 echo "${ECHO_T}$ac_foo" >&6
 if test "$ac_foo" = yes; then
   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
-	echo "$as_me:20185: checking for struct addrinfo" >&5
+	echo "$as_me:25772: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if test "${ac_cv_type_struct_addrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20191 "configure"
+#line 25778 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -20203,16 +25790,17 @@ if (sizeof (struct addrinfo))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20209: \$? = $ac_status" >&5
+  echo "$as_me:25796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20211: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25799: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20214: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25802: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_addrinfo=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20221,7 +25809,7 @@ ac_cv_type_struct_addrinfo=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20224: result: $ac_cv_type_struct_addrinfo" >&5
+echo "$as_me:25812: result: $ac_cv_type_struct_addrinfo" >&5
 echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
 if test $ac_cv_type_struct_addrinfo = yes; then
 
@@ -20239,7 +25827,7 @@ EOF
 
 fi
 
-echo "$as_me:20242: checking for struct winsize" >&5
+echo "$as_me:25830: checking for struct winsize" >&5
 echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
 if test "${ac_cv_struct_winsize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20248,7 +25836,7 @@ else
 ac_cv_struct_winsize=no
 for i in sys/termios.h sys/ioctl.h; do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20251 "configure"
+#line 25839 "configure"
 #include "confdefs.h"
 #include <$i>
 
@@ -20269,10 +25857,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:20272: result: $ac_cv_struct_winsize" >&5
+echo "$as_me:25860: result: $ac_cv_struct_winsize" >&5
 echo "${ECHO_T}$ac_cv_struct_winsize" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 20275 "configure"
+#line 25863 "configure"
 #include "confdefs.h"
 #include <termios.h>
 
@@ -20288,7 +25876,7 @@ fi
 rm -f conftest*
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20291 "configure"
+#line 25879 "configure"
 #include "confdefs.h"
 #include <termios.h>
 
@@ -20303,14 +25891,14 @@ EOF
 fi
 rm -f conftest*
 
-echo "$as_me:20306: checking for struct spwd" >&5
+echo "$as_me:25894: checking for struct spwd" >&5
 echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
 if test "${ac_cv_struct_spwd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20313 "configure"
+#line 25901 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 #ifdef HAVE_SHADOW_H
@@ -20325,16 +25913,17 @@ struct spwd foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25916: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20331: \$? = $ac_status" >&5
+  echo "$as_me:25919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20333: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25922: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20336: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25925: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_struct_spwd=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20345,7 +25934,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:20348: result: $ac_cv_struct_spwd" >&5
+echo "$as_me:25937: result: $ac_cv_struct_spwd" >&5
 echo "${ECHO_T}$ac_cv_struct_spwd" >&6
 
 if test "$ac_cv_struct_spwd" = "yes"; then
@@ -20356,14 +25945,14 @@ EOF
 
 fi
 
-echo "$as_me:20359: checking for sa_len in struct sockaddr" >&5
+echo "$as_me:25948: checking for sa_len in struct sockaddr" >&5
 echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
 if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20366 "configure"
+#line 25955 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -20376,16 +25965,17 @@ struct sockaddr x; x.sa_len;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20382: \$? = $ac_status" >&5
+  echo "$as_me:25971: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20384: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:25974: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20387: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:25977: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_type_struct_sockaddr_sa_len=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20394,7 +25984,7 @@ ac_cv_type_struct_sockaddr_sa_len=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20397: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+echo "$as_me:25987: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
 echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
 if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
 
@@ -20407,14 +25997,14 @@ fi
 for i in int8_t int16_t int32_t int64_t \
 	u_int8_t u_int16_t u_int32_t u_int64_t \
 	uint8_t uint16_t uint32_t uint64_t; do
-	echo "$as_me:20410: checking for $i" >&5
+	echo "$as_me:26000: checking for $i" >&5
 echo $ECHO_N "checking for $i... $ECHO_C" >&6
 
 if eval "test \"\${ac_cv_type_$i+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20417 "configure"
+#line 26007 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_INTTYPES_H
@@ -20443,16 +26033,17 @@ $i x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20449: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20451: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:26042: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20454: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:26045: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval ac_cv_type_$i=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -20470,889 +26061,221 @@ fi
 EOF
 
 	fi
-	echo "$as_me:20473: result: $ac_res" >&5
+	echo "$as_me:26064: result: $ac_res" >&5
 echo "${ECHO_T}$ac_res" >&6
 done
 
-for ac_header in 				\
-	openssl/md4.h				\
-	openssl/md5.h				\
-	openssl/sha.h				\
-	openssl/des.h				\
-	openssl/rc4.h				\
-
-do
-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo "$as_me:20486: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 20492 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:20496: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:20502: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$ac_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$ac_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:20521: result: `eval echo '${'$ac_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
-EOF
-
-fi
-done
-
-echo "$as_me:20531: checking for MD4_Init" >&5
-echo $ECHO_N "checking for MD4_Init... $ECHO_C" >&6
-if test "${ac_cv_funclib_MD4_Init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if eval "test \"\$ac_cv_func_MD4_Init\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in crypto des; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 20547 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-MD4_Init()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20559: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20562: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:20564: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:20567: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD4_Init=$ac_lib; else ac_cv_funclib_MD4_Init=yes; fi";break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_MD4_Init=\${ac_cv_funclib_MD4_Init-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-eval "ac_res=\$ac_cv_funclib_MD4_Init"
-
-if false; then
-
-for ac_func in MD4_Init
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:20589: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 20595 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
+crypto_lib=unknown
 
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
+# Check whether --with-openssl or --without-openssl was given.
+if test "${with_openssl+set}" = set; then
+  withval="$with_openssl"
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20626: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20629: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:20631: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:20634: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:20644: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
+fi;
 
+# Check whether --with-openssl-lib or --without-openssl-lib was given.
+if test "${with_openssl_lib+set}" = set; then
+  withval="$with_openssl_lib"
+  if test "$withval" = "yes" -o "$withval" = "no"; then
+  { { echo "$as_me:26080: error: No argument for --with-openssl-lib" >&5
+echo "$as_me: error: No argument for --with-openssl-lib" >&2;}
+   { (exit 1); exit 1; }; }
+elif test "X$with_openssl" = "X"; then
+  with_openssl=yes
 fi
-done
+fi;
 
+# Check whether --with-openssl-include or --without-openssl-include was given.
+if test "${with_openssl_include+set}" = set; then
+  withval="$with_openssl_include"
+  if test "$withval" = "yes" -o "$withval" = "no"; then
+  { { echo "$as_me:26092: error: No argument for --with-openssl-include" >&5
+echo "$as_me: error: No argument for --with-openssl-include" >&2;}
+   { (exit 1); exit 1; }; }
+elif test "X$with_openssl" = "X"; then
+  with_openssl=yes
 fi
-# MD4_Init
-eval "ac_tr_func=HAVE_`echo MD4_Init | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_MD4_Init=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_MD4_Init=yes"
-	eval "LIB_MD4_Init="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$as_me:20668: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_MD4_Init=no"
-	eval "LIB_MD4_Init="
-	echo "$as_me:20674: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_MD4_Init=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
+fi;
 
-	echo "$as_me:20688: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
+case "$with_openssl" in
+yes)	;;
+no)	;;
+"")	;;
+*)	if test "$with_openssl_include" = ""; then
+		with_openssl_include="$with_openssl/include"
+	fi
+	if test "$with_openssl_lib" = ""; then
+		with_openssl_lib="$with_openssl/lib$abilibdirext"
+	fi
 	;;
 esac
 
-echo "$as_me:20693: checking for MD5_Init" >&5
-echo $ECHO_N "checking for MD5_Init... $ECHO_C" >&6
-if test "${ac_cv_funclib_MD5_Init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+DIR_des=
 
-if eval "test \"\$ac_cv_func_MD5_Init\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in crypto des; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 20709 "configure"
-#include "confdefs.h"
+echo "$as_me:26115: checking for crypto library" >&5
+echo $ECHO_N "checking for crypto library... $ECHO_C" >&6
 
-int
-main ()
-{
-MD5_Init()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20721: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20724: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:20726: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:20729: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD5_Init=$ac_lib; else ac_cv_funclib_MD5_Init=yes; fi";break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_MD5_Init=\${ac_cv_funclib_MD5_Init-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
+if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
 
-eval "ac_res=\$ac_cv_funclib_MD5_Init"
-
-if false; then
-
-for ac_func in MD5_Init
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:20751: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  INCLUDE_des=
+  LIB_des=
+  if test "$with_openssl_include" != ""; then
+    INCLUDE_des="-I${with_openssl}/include"
+  fi
+  if test "$with_openssl_lib" != ""; then
+    LIB_des="-L${with_openssl}/lib"
+  fi
+  CPPFLAGS="${INCLUDE_des} ${CPPFLAGS}"
+  LIB_des="${LIB_des} -lcrypto"
+  LIB_des_a="$LIB_des"
+  LIB_des_so="$LIB_des"
+  LIB_des_appl="$LIB_des"
+  LIBS="${LIBS} ${LIB_des}"
   cat >conftest.$ac_ext <<_ACEOF
-#line 20757 "configure"
+#line 26137 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
 
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20788: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20791: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:20793: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:20796: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:20806: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
-
-fi
-done
-
-fi
-# MD5_Init
-eval "ac_tr_func=HAVE_`echo MD5_Init | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_MD5_Init=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_MD5_Init=yes"
-	eval "LIB_MD5_Init="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$as_me:20830: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_MD5_Init=no"
-	eval "LIB_MD5_Init="
-	echo "$as_me:20836: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_MD5_Init=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$as_me:20850: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
-	;;
-esac
-
-echo "$as_me:20855: checking for SHA1_Init" >&5
-echo $ECHO_N "checking for SHA1_Init... $ECHO_C" >&6
-if test "${ac_cv_funclib_SHA1_Init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if eval "test \"\$ac_cv_func_SHA1_Init\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in crypto des; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 20871 "configure"
-#include "confdefs.h"
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+  #include <openssl/sha.h>
+  #include <des.h>
+  #include <openssl/rc4.h>
 
 int
 main ()
 {
-SHA1_Init()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20883: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20886: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:20888: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:20891: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_SHA1_Init=$ac_lib; else ac_cv_funclib_SHA1_Init=yes; fi";break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_SHA1_Init=\${ac_cv_funclib_SHA1_Init-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
-fi
-
-eval "ac_res=\$ac_cv_funclib_SHA1_Init"
 
-if false; then
+    MD4_CTX md4;
+    MD5_CTX md5;
+    SHA_CTX sha1;
 
-for ac_func in SHA1_Init
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:20913: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 20919 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
+    MD4_Init(&md4);
+    MD5_Init(&md5);
+    SHA1_Init(&sha1);
 
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
+    des_cbc_encrypt(0, 0, 0, 0, 0, 0);
+    RC4(0, 0, 0, 0);
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20953: \$? = $ac_status" >&5
+  echo "$as_me:26169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:20955: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26172: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20958: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:20968: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
-
-fi
-done
-
-fi
-# SHA1_Init
-eval "ac_tr_func=HAVE_`echo SHA1_Init | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_SHA1_Init=$ac_res"
+  echo "$as_me:26175: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
 
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_SHA1_Init=yes"
-	eval "LIB_SHA1_Init="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+  crypto_lib=libcrypto
 
-	echo "$as_me:20992: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_SHA1_Init=no"
-	eval "LIB_SHA1_Init="
-	echo "$as_me:20998: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_SHA1_Init=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
+cat >>confdefs.h <<\EOF
+#define HAVE_OPENSSL 1
 EOF
 
-	echo "$as_me:21012: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
-	;;
-esac
-
-echo "$as_me:21017: checking for des_cbc_encrypt" >&5
-echo $ECHO_N "checking for des_cbc_encrypt... $ECHO_C" >&6
-if test "${ac_cv_funclib_des_cbc_encrypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if eval "test \"\$ac_cv_func_des_cbc_encrypt\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in crypto des; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 21033 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-des_cbc_encrypt()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21045: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:21050: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:21053: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_des_cbc_encrypt=$ac_lib; else ac_cv_funclib_des_cbc_encrypt=yes; fi";break
+  echo "$as_me:26184: result: libcrypto" >&5
+echo "${ECHO_T}libcrypto" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_des_cbc_encrypt=\${ac_cv_funclib_des_cbc_encrypt-no}"
-	LIBS="$ac_save_LIBS"
-fi
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+  CPPFLAGS="$save_CPPFLAGS"
+  LIBS="$save_LIBS"
 fi
 
-eval "ac_res=\$ac_cv_funclib_des_cbc_encrypt"
-
-if false; then
+if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
 
-for ac_func in des_cbc_encrypt
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21075: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  save_CPPFLAGS="$CPPFLAGS"
+  save_LIBS="$LIBS"
+  INCLUDE_des="${INCLUDE_krb4}"
+  LIB_des=
+  if test "$krb4_libdir"; then
+    LIB_des="-L${krb4_libdir}"
+  fi
+  LIB_des="${LIB_des} -ldes"
+  CPPFLAGS="${CPPFLAGS} ${INCLUDE_des}"
+  LIBS="${LIBS} ${LIB_des}"
+  LIB_des_a="$LIB_des"
+  LIB_des_so="$LIB_des"
+  LIB_des_appl="$LIB_des"
+  LIBS="${LIBS} ${LIB_des}"
   cat >conftest.$ac_ext <<_ACEOF
-#line 21081 "configure"
+#line 26212 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21112: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21115: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:21117: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:21120: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:21130: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
-
-fi
-done
 
-fi
-# des_cbc_encrypt
-eval "ac_tr_func=HAVE_`echo des_cbc_encrypt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_des_cbc_encrypt=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_des_cbc_encrypt=yes"
-	eval "LIB_des_cbc_encrypt="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$as_me:21154: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_des_cbc_encrypt=no"
-	eval "LIB_des_cbc_encrypt="
-	echo "$as_me:21160: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_des_cbc_encrypt=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$as_me:21174: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
-	;;
-esac
-
-echo "$as_me:21179: checking for RC4" >&5
-echo $ECHO_N "checking for RC4... $ECHO_C" >&6
-if test "${ac_cv_funclib_RC4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if eval "test \"\$ac_cv_func_RC4\" != yes" ; then
-	ac_save_LIBS="$LIBS"
-	for ac_lib in crypto des; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
-		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-#line 21195 "configure"
-#include "confdefs.h"
+  #undef KRB5 /* makes md4.h et al unhappy */
+  #define KRB4
+  #include <md4.h>
+  #include <md5.h>
+  #include <sha.h>
+  #include <des.h>
+  #include <rc4.h>
 
 int
 main ()
 {
-RC4()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21207: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21210: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { (eval echo "$as_me:21212: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
-  ac_status=$?
-  echo "$as_me:21215: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "if test -n \"$ac_lib\";then ac_cv_funclib_RC4=$ac_lib; else ac_cv_funclib_RC4=yes; fi";break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f conftest$ac_exeext conftest.$ac_ext
-	done
-	eval "ac_cv_funclib_RC4=\${ac_cv_funclib_RC4-no}"
-	LIBS="$ac_save_LIBS"
-fi
 
-fi
+    MD4_CTX md4;
+    MD5_CTX md5;
+    SHA_CTX sha1;
 
-eval "ac_res=\$ac_cv_funclib_RC4"
+    MD4_Init(&md4);
+    MD5_Init(&md5);
+    SHA1_Init(&sha1);
 
-if false; then
-
-for ac_func in RC4
-do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21237: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 21243 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
+    des_cbc_encrypt(0, 0, 0, 0, 0, 0);
+    RC4(0, 0, 0, 0);
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21277: \$? = $ac_status" >&5
+  echo "$as_me:26246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:21279: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26249: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21282: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:26252: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  crypto_lib=krb4; echo "$as_me:26254: result: krb4's libdes" >&5
+echo "${ECHO_T}krb4's libdes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+  CPPFLAGS="$save_CPPFLAGS"
+  LIBS="$save_LIBS"
 fi
-echo "$as_me:21292: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
-  cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
-EOF
 
-fi
-done
+if test "$crypto_lib" = "unknown"; then
 
-fi
-# RC4
-eval "ac_tr_func=HAVE_`echo RC4 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
-eval "LIB_RC4=$ac_res"
-
-case "$ac_res" in
-	yes)
-	eval "ac_cv_func_RC4=yes"
-	eval "LIB_RC4="
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	echo "$as_me:21316: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	;;
-	no)
-	eval "ac_cv_func_RC4=no"
-	eval "LIB_RC4="
-	echo "$as_me:21322: result: no" >&5
-echo "${ECHO_T}no" >&6
-	;;
-	*)
-	eval "ac_cv_func_RC4=yes"
-	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
-	cat >>confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-	cat >>confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-	echo "$as_me:21336: result: yes, in $ac_res" >&5
-echo "${ECHO_T}yes, in $ac_res" >&6
-	;;
-esac
-
-if test "$ac_cv_func_des_cbc_encrypt" = "yes" -a \
-"$ac_cv_func_MD4_Init"  = "yes" -a \
-"$ac_cv_func_MD5_Init"  = "yes" -a \
-"$ac_cv_func_SHA1_Init" = "yes" -a \
-"$ac_cv_func_RC4" = "yes"; then
-  DIR_des=''
-  LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init"
-  LIB_des_appl="$LIB_des"
-else
   DIR_des='des'
   LIB_des='$(top_builddir)/lib/des/libdes.la'
+  LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
+  LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
   LIB_des_appl="-ldes"
+
+  echo "$as_me:26273: result: included libdes" >&5
+echo "${ECHO_T}included libdes" >&6
+
 fi
 
-echo "$as_me:21355: checking for el_init" >&5
+echo "$as_me:26278: checking for el_init" >&5
 echo $ECHO_N "checking for el_init... $ECHO_C" >&6
 if test "${ac_cv_funclib_el_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21361,14 +26284,16 @@ else
 if eval "test \"\$ac_cv_func_el_init\" != yes" ; then
 	ac_save_LIBS="$LIBS"
 	for ac_lib in "" edit; do
-		if test -n "$ac_lib"; then
-			ac_lib="-l$ac_lib"
-		else
-			ac_lib=""
-		fi
+		case "$ac_lib" in
+		"") ;;
+		yes) ac_lib="" ;;
+		no) continue ;;
+		-l*) ;;
+		*) ac_lib="-l$ac_lib" ;;
+		esac
 		LIBS=" $ac_lib $LIB_tgetent $ac_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21371 "configure"
+#line 26296 "configure"
 #include "confdefs.h"
 
 int
@@ -21380,22 +26305,23 @@ el_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21386: \$? = $ac_status" >&5
+  echo "$as_me:26311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:21388: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26314: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21391: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:26317: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   eval "if test -n \"$ac_lib\";then ac_cv_funclib_el_init=$ac_lib; else ac_cv_funclib_el_init=yes; fi";break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	done
 	eval "ac_cv_funclib_el_init=\${ac_cv_funclib_el_init-no}"
 	LIBS="$ac_save_LIBS"
@@ -21409,14 +26335,14 @@ if false; then
 
 for ac_func in el_init
 do
-ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo "$as_me:21413: checking for $ac_func" >&5
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:26339: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$ac_ac_var+set}\" = set"; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21419 "configure"
+#line 26345 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21447,29 +26373,30 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21453: \$? = $ac_status" >&5
+  echo "$as_me:26379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:21455: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26382: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21458: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  eval "$ac_ac_var=yes"
+  echo "$as_me:26385: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-eval "$ac_ac_var=no"
+eval "$as_ac_var=no"
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21468: result: `eval echo '${'$ac_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
-if test `eval echo '${'$ac_ac_var'}'` = yes; then
+echo "$as_me:26395: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
 fi
@@ -21489,13 +26416,13 @@ case "$ac_res" in
 #define $ac_tr_func 1
 EOF
 
-	echo "$as_me:21492: result: yes" >&5
+	echo "$as_me:26419: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	;;
 	no)
 	eval "ac_cv_func_el_init=no"
 	eval "LIB_el_init="
-	echo "$as_me:21498: result: no" >&5
+	echo "$as_me:26425: result: no" >&5
 echo "${ECHO_T}no" >&6
 	;;
 	*)
@@ -21509,20 +26436,20 @@ EOF
 #define $ac_tr_lib 1
 EOF
 
-	echo "$as_me:21512: result: yes, in $ac_res" >&5
+	echo "$as_me:26439: result: yes, in $ac_res" >&5
 echo "${ECHO_T}yes, in $ac_res" >&6
 	;;
 esac
 
 if test "$ac_cv_func_el_init" = yes ; then
-	echo "$as_me:21518: checking for four argument el_init" >&5
+	echo "$as_me:26445: checking for four argument el_init" >&5
 echo $ECHO_N "checking for four argument el_init... $ECHO_C" >&6
 if test "${ac_cv_func_el_init_four+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21525 "configure"
+#line 26452 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 			#include <histedit.h>
@@ -21535,16 +26462,17 @@ el_init("", NULL, NULL, NULL);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26465: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21541: \$? = $ac_status" >&5
+  echo "$as_me:26468: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:21543: \"test -s conftest.$ac_objext\"") >&5
-  (eval test -s conftest.$ac_objext) 2>&5
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:26471: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21546: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:26474: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_el_init_four=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -21553,7 +26481,7 @@ ac_cv_func_el_init_four=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21556: result: $ac_cv_func_el_init_four" >&5
+echo "$as_me:26484: result: $ac_cv_func_el_init_four" >&5
 echo "${ECHO_T}$ac_cv_func_el_init_four" >&6
 	if test "$ac_cv_func_el_init_four" = yes; then
 
@@ -21624,13 +26552,13 @@ fi
 #
 # And also something wierd has happend with dec-osf1, fallback to bsd-ptys
 
-echo "$as_me:21627: checking for getmsg" >&5
+echo "$as_me:26555: checking for getmsg" >&5
 echo $ECHO_N "checking for getmsg... $ECHO_C" >&6
 if test "${ac_cv_func_getmsg+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21633 "configure"
+#line 26561 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmsg (); below.  */
@@ -21661,30 +26589,31 @@ f = getmsg;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26592: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21667: \$? = $ac_status" >&5
+  echo "$as_me:26595: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { (eval echo "$as_me:21669: \"test -s conftest$ac_exeext\"") >&5
-  (eval test -s conftest$ac_exeext) 2>&5
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26598: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21672: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:26601: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_getmsg=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_getmsg=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21682: result: $ac_cv_func_getmsg" >&5
+echo "$as_me:26611: result: $ac_cv_func_getmsg" >&5
 echo "${ECHO_T}$ac_cv_func_getmsg" >&6
 
 if test "$ac_cv_func_getmsg" = "yes"; then
 
-echo "$as_me:21687: checking for working getmsg" >&5
+echo "$as_me:26616: checking for working getmsg" >&5
 echo $ECHO_N "checking for working getmsg... $ECHO_C" >&6
 if test "${ac_cv_func_getmsg_work+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21693,7 +26622,7 @@ else
   ac_cv_func_getmsg_work=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21696 "configure"
+#line 26625 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -21710,15 +26639,16 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21716: \$? = $ac_status" >&5
-  (exit $ac_status); } && { (eval echo "$as_me:21717: \"./conftest$ac_exeext\"") >&5
-  (eval ./conftest$ac_exeext) 2>&5
+  echo "$as_me:26645: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:26647: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21720: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  echo "$as_me:26650: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_func_getmsg_work=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
@@ -21726,10 +26656,10 @@ echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 ac_cv_func_getmsg_work=no
 fi
-rm -f conftest$ac_exeext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:21732: result: $ac_cv_func_getmsg_work" >&5
+echo "$as_me:26662: result: $ac_cv_func_getmsg_work" >&5
 echo "${ECHO_T}$ac_cv_func_getmsg_work" >&6
 test "$ac_cv_func_getmsg_work" = "yes" &&
 
@@ -21740,7 +26670,7 @@ EOF
 fi
 
 if test "$ac_cv_func_getmsg_work" = yes; then
-echo "$as_me:21743: checking for streamspty" >&5
+echo "$as_me:26673: checking for streamspty" >&5
 echo $ECHO_N "checking for streamspty... $ECHO_C" >&6
 case "$host" in
 *-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[01]*)
@@ -21750,7 +26680,7 @@ case "$host" in
 	krb_cv_sys_streamspty=yes
 	;;
 esac
-echo "$as_me:21753: result: $krb_cv_sys_streamspty" >&5
+echo "$as_me:26683: result: $krb_cv_sys_streamspty" >&5
 echo "${ECHO_T}$krb_cv_sys_streamspty" >&6
 fi
 if test "$krb_cv_sys_streamspty" = yes; then
@@ -21761,7 +26691,162 @@ EOF
 
 fi
 
-echo "$as_me:21764: checking which authentication modules should be built" >&5
+# Extract the first word of "compile_et", so it can be a program name with args.
+set dummy compile_et; ac_word=$2
+echo "$as_me:26696: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_COMPILE_ET+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$COMPILE_ET"; then
+  ac_cv_prog_COMPILE_ET="$COMPILE_ET" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_COMPILE_ET="compile_et"
+echo "$as_me:26711: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+COMPILE_ET=$ac_cv_prog_COMPILE_ET
+if test -n "$COMPILE_ET"; then
+  echo "$as_me:26719: result: $COMPILE_ET" >&5
+echo "${ECHO_T}$COMPILE_ET" >&6
+else
+  echo "$as_me:26722: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+krb_cv_compile_et="no"
+if test "${COMPILE_ET}" = "compile_et"; then
+
+echo "$as_me:26729: checking whether compile_et has the features we need" >&5
+echo $ECHO_N "checking whether compile_et has the features we need... $ECHO_C" >&6
+cat > conftest_et.et <<'EOF'
+error_table conf
+prefix CONFTEST
+index 1
+error_code CODE1, "CODE1"
+index 128
+error_code CODE2, "CODE2"
+end
+EOF
+if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
+    save_CPPFLAGS="${save_CPPFLAGS}"
+  if test -d "/usr/include/et"; then
+    CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
+  fi
+    if test "$cross_compiling" = yes; then
+  { { echo "$as_me:26746: error: cannot run test program while cross compiling" >&5
+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 26751 "configure"
+#include "confdefs.h"
+
+#include <com_err.h>
+#include <string.h>
+#include "conftest_et.h"
+int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:26761: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:26764: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:26766: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:26769: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  krb_cv_compile_et="yes"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+CPPFLAGS="${save_CPPFLAGS}"
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:26781: result: ${krb_cv_compile_et}" >&5
+echo "${ECHO_T}${krb_cv_compile_et}" >&6
+rm -fr conftest*
+fi
+
+if test "${krb_cv_compile_et}" = "yes"; then
+    krb_cv_save_LIBS="${LIBS}"
+  LIBS="${LIBS} -lcom_err"
+  echo "$as_me:26789: checking for com_err" >&5
+echo $ECHO_N "checking for com_err... $ECHO_C" >&6
+  cat >conftest.$ac_ext <<_ACEOF
+#line 26792 "configure"
+#include "confdefs.h"
+#include <com_err.h>
+int
+main ()
+{
+
+    const char *p;
+    p = error_message(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:26807: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:26810: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:26813: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:26816: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  krb_cv_com_err="yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+  echo "$as_me:26825: result: ${krb_cv_com_err}" >&5
+echo "${ECHO_T}${krb_cv_com_err}" >&6
+  LIBS="${krb_cv_save_LIBS}"
+else
+    krb_cv_com_err="no"
+fi
+
+if test "${krb_cv_com_err}" = "yes"; then
+    DIR_com_err=""
+    LIB_com_err="-lcom_err"
+    LIB_com_err_a=""
+    LIB_com_err_so=""
+    { echo "$as_me:26837: Using the already-installed com_err" >&5
+echo "$as_me: Using the already-installed com_err" >&6;}
+else
+    COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et"
+    DIR_com_err="com_err"
+    LIB_com_err="\$(top_builddir)/lib/com_err/libcom_err.la"
+    LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
+    LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
+    { echo "$as_me:26845: Using our own com_err" >&5
+echo "$as_me: Using our own com_err" >&6;}
+fi
+
+echo "$as_me:26849: checking which authentication modules should be built" >&5
 echo $ECHO_N "checking which authentication modules should be built... $ECHO_C" >&6
 
 LIB_AUTH_SUBDIRS=
@@ -21778,7 +26863,7 @@ case "${host}" in
 *-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
 esac
 
-echo "$as_me:21781: result: $LIB_AUTH_SUBDIRS" >&5
+echo "$as_me:26866: result: $LIB_AUTH_SUBDIRS" >&5
 echo "${ECHO_T}$LIB_AUTH_SUBDIRS" >&6
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -21799,10 +26884,6 @@ EOF
 
 done
 
-if false; then
-	# hack to shut up automake
-	LIBOBJS="$LIBOBJS make-print-version.o"
-fi
 LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/kadm5/Makefile lib/Makefile lib/45/Makefile lib/auth/Makefile lib/auth/afskauthlib/Makefile lib/auth/pam/Makefile lib/auth/sia/Makefile lib/asn1/Makefile lib/com_err/Makefile lib/des/Makefile lib/editline/Makefile lib/gssapi/Makefile lib/hdb/Makefile lib/kadm5/Makefile lib/kafs/Makefile lib/kdfs/Makefile lib/krb5/Makefile lib/otp/Makefile lib/roken/Makefile lib/sl/Makefile lib/vers/Makefile kuser/Makefile kpasswd/Makefile kadmin/Makefile admin/Makefile kdc/Makefile appl/Makefile appl/afsutil/Makefile appl/ftp/Makefile appl/ftp/common/Makefile appl/ftp/ftp/Makefile appl/ftp/ftpd/Makefile appl/kx/Makefile appl/login/Makefile appl/otp/Makefile appl/popper/Makefile appl/push/Makefile appl/rsh/Makefile appl/rcp/Makefile appl/su/Makefile appl/xnlock/Makefile appl/telnet/Makefile appl/telnet/libtelnet/Makefile appl/telnet/telnet/Makefile appl/telnet/telnetd/Makefile appl/test/Makefile appl/kf/Makefile appl/dceutils/Makefile doc/Makefile tools/Makefile"
@@ -21836,12 +26917,12 @@ _ACEOF
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
         "s/'/'\\\\''/g;
-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } |
@@ -21866,10 +26947,19 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH is dangerous, but if there is a colon in the path, we need to
-# keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ 	]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ 	]*$//;
+}'
 fi
 
 DEFS=-DHAVE_CONFIG_H
@@ -21877,19 +26967,22 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:21880: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:26970: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<\_ACEOF
-#! /bin/sh
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
-as_me=`echo "$0" | sed 's,.*/,,'`
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -21898,47 +26991,34 @@ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
 
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-rm -f conftest conftest.exe conftest.file
-echo >conftest.file
-if ln -s conftest.file conftest 2>/dev/null; then
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
   # We could just check for DJGPP; but this test a) works b) is more generic
   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conftest.exe; then
+  if test -f conf$$.exe; then
     # Don't use ln at all; we don't have any links
     as_ln_s='cp -p'
   else
     as_ln_s='ln -s'
   fi
-elif ln conftest.file conftest 2>/dev/null; then
+elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conftest conftest.exe conftest.file
+rm -f conf$$ conf$$.exe conf$$.file
 
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conftest.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conftest.file
-if test -x conftest.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
-elif test -f conftest.file >/dev/null 2>&1; then
-  as_executable_p="test -f"
-else
-  { { echo "$as_me:21937: error: cannot check whether a file is executable on this system" >&5
-echo "$as_me: error: cannot check whether a file is executable on this system" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f conftest.file
+as_executable_p="test -f"
 
 # Support unset when possible.
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
@@ -21966,27 +27046,8 @@ IFS=" 	$as_nl"
 # CDPATH.
 $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-exec 5>>config.log
 exec 6>&1
 
-cat >&5 << EOF
-
-## ----------------------- ##
-## Running config.status.  ##
-## ----------------------- ##
-
-This file was extended by $as_me (heimdal 0.3e) 2.49d, executed with
- > $0 $@
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-
-EOF
-
 _ACEOF
 
 # Files that config.status was made for.
@@ -22037,9 +27098,14 @@ EOF
 
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
-$CONFIG_STATUS generated by $as_me (Autoconf 2.49d).
-Configured on host $ac_hostname by
-  `echo "$0 $ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`"
+heimdal config.status 0.4e
+configured by $0, generated by GNU Autoconf 2.52,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
 srcdir=$srcdir
 INSTALL="$INSTALL"
 EOF
@@ -22077,7 +27143,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:22080: error: ambiguous option: $1
+    { { echo "$as_me:27146: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -22095,79 +27161,122 @@ Try \`$0 --help' for more information." >&2;}
     CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
 
-  # Handling of arguments.
-  'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  'include/Makefile' ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
-  'include/kadm5/Makefile' ) CONFIG_FILES="$CONFIG_FILES include/kadm5/Makefile" ;;
-  'lib/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-  'lib/45/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/45/Makefile" ;;
-  'lib/auth/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/auth/Makefile" ;;
-  'lib/auth/afskauthlib/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/auth/afskauthlib/Makefile" ;;
-  'lib/auth/pam/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/auth/pam/Makefile" ;;
-  'lib/auth/sia/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/auth/sia/Makefile" ;;
-  'lib/asn1/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/asn1/Makefile" ;;
-  'lib/com_err/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/com_err/Makefile" ;;
-  'lib/des/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/des/Makefile" ;;
-  'lib/editline/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/editline/Makefile" ;;
-  'lib/gssapi/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/gssapi/Makefile" ;;
-  'lib/hdb/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/hdb/Makefile" ;;
-  'lib/kadm5/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/kadm5/Makefile" ;;
-  'lib/kafs/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/kafs/Makefile" ;;
-  'lib/kdfs/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/kdfs/Makefile" ;;
-  'lib/krb5/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/krb5/Makefile" ;;
-  'lib/otp/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/otp/Makefile" ;;
-  'lib/roken/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/roken/Makefile" ;;
-  'lib/sl/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/sl/Makefile" ;;
-  'lib/vers/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/vers/Makefile" ;;
-  'kuser/Makefile' ) CONFIG_FILES="$CONFIG_FILES kuser/Makefile" ;;
-  'kpasswd/Makefile' ) CONFIG_FILES="$CONFIG_FILES kpasswd/Makefile" ;;
-  'kadmin/Makefile' ) CONFIG_FILES="$CONFIG_FILES kadmin/Makefile" ;;
-  'admin/Makefile' ) CONFIG_FILES="$CONFIG_FILES admin/Makefile" ;;
-  'kdc/Makefile' ) CONFIG_FILES="$CONFIG_FILES kdc/Makefile" ;;
-  'appl/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/Makefile" ;;
-  'appl/afsutil/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/afsutil/Makefile" ;;
-  'appl/ftp/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/ftp/Makefile" ;;
-  'appl/ftp/common/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/ftp/common/Makefile" ;;
-  'appl/ftp/ftp/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftp/Makefile" ;;
-  'appl/ftp/ftpd/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftpd/Makefile" ;;
-  'appl/kx/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/kx/Makefile" ;;
-  'appl/login/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/login/Makefile" ;;
-  'appl/otp/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/otp/Makefile" ;;
-  'appl/popper/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/popper/Makefile" ;;
-  'appl/push/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/push/Makefile" ;;
-  'appl/rsh/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/rsh/Makefile" ;;
-  'appl/rcp/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/rcp/Makefile" ;;
-  'appl/su/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/su/Makefile" ;;
-  'appl/xnlock/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/xnlock/Makefile" ;;
-  'appl/telnet/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/telnet/Makefile" ;;
-  'appl/telnet/libtelnet/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/telnet/libtelnet/Makefile" ;;
-  'appl/telnet/telnet/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnet/Makefile" ;;
-  'appl/telnet/telnetd/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnetd/Makefile" ;;
-  'appl/test/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/test/Makefile" ;;
-  'appl/kf/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/kf/Makefile" ;;
-  'appl/dceutils/Makefile' ) CONFIG_FILES="$CONFIG_FILES appl/dceutils/Makefile" ;;
-  'doc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  'tools/Makefile' ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-  'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  'default-2' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
-  'include/config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
-
   # This is an error.
-  -*) { { echo "$as_me:22156: error: unrecognized option: $1
+  -*) { { echo "$as_me:27165: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
    { (exit 1); exit 1; }; } ;;
-  *) { { echo "$as_me:22161: error: invalid argument: $1" >&5
-echo "$as_me: error: invalid argument: $1" >&2;}
-   { (exit 1); exit 1; }; };;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
   esac
   shift
 done
 
+exec 5>>config.log
+cat >&5 << _ACEOF
+
+## ----------------------- ##
+## Running config.status.  ##
+## ----------------------- ##
+
+This file was extended by $as_me (heimdal 0.4e) 2.52, executed with
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  > $ac_cs_invocation
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+
+_ACEOF
+EOF
+
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
+
+am_indx=1
+  for am_file in include/config.h; do
+    case " $CONFIG_HEADERS " in
+    *" $am_file "*)
+      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
+      ;;
+    esac
+    am_indx=\`expr \$am_indx + 1\`
+  done
+AMDEP="$AMDEP"
+ac_aux_dir="$ac_aux_dir"
+
 EOF
 
 cat >>$CONFIG_STATUS <<\EOF
+for ac_config_target in $ac_config_targets
+do
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+  "include/kadm5/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/kadm5/Makefile" ;;
+  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+  "lib/45/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/45/Makefile" ;;
+  "lib/auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/Makefile" ;;
+  "lib/auth/afskauthlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/afskauthlib/Makefile" ;;
+  "lib/auth/pam/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/pam/Makefile" ;;
+  "lib/auth/sia/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/sia/Makefile" ;;
+  "lib/asn1/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/asn1/Makefile" ;;
+  "lib/com_err/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/com_err/Makefile" ;;
+  "lib/des/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/des/Makefile" ;;
+  "lib/editline/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/editline/Makefile" ;;
+  "lib/gssapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/gssapi/Makefile" ;;
+  "lib/hdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/hdb/Makefile" ;;
+  "lib/kadm5/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kadm5/Makefile" ;;
+  "lib/kafs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kafs/Makefile" ;;
+  "lib/kdfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kdfs/Makefile" ;;
+  "lib/krb5/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/krb5/Makefile" ;;
+  "lib/otp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/otp/Makefile" ;;
+  "lib/roken/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/roken/Makefile" ;;
+  "lib/sl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/sl/Makefile" ;;
+  "lib/vers/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/vers/Makefile" ;;
+  "kuser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuser/Makefile" ;;
+  "kpasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpasswd/Makefile" ;;
+  "kadmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kadmin/Makefile" ;;
+  "admin/Makefile" ) CONFIG_FILES="$CONFIG_FILES admin/Makefile" ;;
+  "kdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdc/Makefile" ;;
+  "appl/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/Makefile" ;;
+  "appl/afsutil/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/afsutil/Makefile" ;;
+  "appl/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/Makefile" ;;
+  "appl/ftp/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/common/Makefile" ;;
+  "appl/ftp/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftp/Makefile" ;;
+  "appl/ftp/ftpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftpd/Makefile" ;;
+  "appl/kx/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/kx/Makefile" ;;
+  "appl/login/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/login/Makefile" ;;
+  "appl/otp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/otp/Makefile" ;;
+  "appl/popper/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/popper/Makefile" ;;
+  "appl/push/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/push/Makefile" ;;
+  "appl/rsh/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/rsh/Makefile" ;;
+  "appl/rcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/rcp/Makefile" ;;
+  "appl/su/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/su/Makefile" ;;
+  "appl/xnlock/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/xnlock/Makefile" ;;
+  "appl/telnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/Makefile" ;;
+  "appl/telnet/libtelnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/libtelnet/Makefile" ;;
+  "appl/telnet/telnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnet/Makefile" ;;
+  "appl/telnet/telnetd/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnetd/Makefile" ;;
+  "appl/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/test/Makefile" ;;
+  "appl/kf/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/kf/Makefile" ;;
+  "appl/dceutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/dceutils/Makefile" ;;
+  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+  "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
+  "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
+  *) { { echo "$as_me:27274: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -22182,7 +27291,7 @@ fi
 $debug ||
 {
   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit $?); exit $?; }' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 
 # Create a (secure) tmp directory for tmp files.
@@ -22203,16 +27312,6 @@ $debug ||
 EOF
 
 cat >>$CONFIG_STATUS <<EOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP="$AMDEP"
-ac_aux_dir="$ac_aux_dir"
-
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
 
 #
 # CONFIG_FILES section.
@@ -22245,19 +27344,23 @@ s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
 s,@DEFS@,$DEFS,;t t
 s,@LIBS@,$LIBS,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@OBJEXT@,$OBJEXT,;t t
 s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
 s,@CPP@,$CPP,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -22292,16 +27395,18 @@ s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@LN_S@,$LN_S,;t t
+s,@ECHO@,$ECHO,;t t
 s,@STRIP@,$STRIP,;t t
 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@WFLAGS@,$WFLAGS,;t t
 s,@WFLAGS_NOUNUSED@,$WFLAGS_NOUNUSED,;t t
 s,@WFLAGS_NOIMPLICITINT@,$WFLAGS_NOIMPLICITINT,;t t
+s,@LIB_db_create@,$LIB_db_create,;t t
 s,@LIB_dbopen@,$LIB_dbopen,;t t
 s,@LIB_dbm_firstkey@,$LIB_dbm_firstkey,;t t
-s,@LIB_db_create@,$LIB_db_create,;t t
 s,@DBLIB@,$DBLIB,;t t
+s,@LIB_NDBM@,$LIB_NDBM,;t t
 s,@VOID_RETSIGTYPE@,$VOID_RETSIGTYPE,;t t
 s,@have_err_h_TRUE@,$have_err_h_TRUE,;t t
 s,@have_err_h_FALSE@,$have_err_h_FALSE,;t t
@@ -22323,7 +27428,13 @@ s,@LIB_getsockopt@,$LIB_getsockopt,;t t
 s,@LIB_setsockopt@,$LIB_setsockopt,;t t
 s,@LIB_hstrerror@,$LIB_hstrerror,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LIB_bswap16@,$LIB_bswap16,;t t
+s,@LIB_bswap32@,$LIB_bswap32,;t t
 s,@LIB_pidfile@,$LIB_pidfile,;t t
+s,@LIB_getaddrinfo@,$LIB_getaddrinfo,;t t
+s,@LIB_getnameinfo@,$LIB_getnameinfo,;t t
+s,@LIB_freeaddrinfo@,$LIB_freeaddrinfo,;t t
+s,@LIB_gai_strerror@,$LIB_gai_strerror,;t t
 s,@LIB_crypt@,$LIB_crypt,;t t
 s,@DIR_roken@,$DIR_roken,;t t
 s,@LIB_roken@,$LIB_roken,;t t
@@ -22385,19 +27496,24 @@ s,@LIB_XauFileName@,$LIB_XauFileName,;t t
 s,@NEED_WRITEAUTH_TRUE@,$NEED_WRITEAUTH_TRUE,;t t
 s,@NEED_WRITEAUTH_FALSE@,$NEED_WRITEAUTH_FALSE,;t t
 s,@LIB_logwtmp@,$LIB_logwtmp,;t t
+s,@LIB_logout@,$LIB_logout,;t t
+s,@LIB_openpty@,$LIB_openpty,;t t
 s,@LIB_tgetent@,$LIB_tgetent,;t t
 s,@LIB_getpwnam_r@,$LIB_getpwnam_r,;t t
-s,@LIB_MD4_Init@,$LIB_MD4_Init,;t t
-s,@LIB_MD5_Init@,$LIB_MD5_Init,;t t
-s,@LIB_SHA1_Init@,$LIB_SHA1_Init,;t t
-s,@LIB_des_cbc_encrypt@,$LIB_des_cbc_encrypt,;t t
-s,@LIB_RC4@,$LIB_RC4,;t t
 s,@DIR_des@,$DIR_des,;t t
+s,@INCLUDE_des@,$INCLUDE_des,;t t
 s,@LIB_des@,$LIB_des,;t t
+s,@LIB_des_a@,$LIB_des_a,;t t
+s,@LIB_des_so@,$LIB_des_so,;t t
 s,@LIB_des_appl@,$LIB_des_appl,;t t
 s,@LIB_el_init@,$LIB_el_init,;t t
 s,@el_compat_TRUE@,$el_compat_TRUE,;t t
 s,@el_compat_FALSE@,$el_compat_FALSE,;t t
+s,@COMPILE_ET@,$COMPILE_ET,;t t
+s,@DIR_com_err@,$DIR_com_err,;t t
+s,@LIB_com_err@,$LIB_com_err,;t t
+s,@LIB_com_err_a@,$LIB_com_err_a,;t t
+s,@LIB_com_err_so@,$LIB_com_err_so,;t t
 s,@LIB_AUTH_SUBDIRS@,$LIB_AUTH_SUBDIRS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
@@ -22514,7 +27630,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:22517: creating $ac_file" >&5
+    { echo "$as_me:27633: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -22530,9 +27646,9 @@ echo "$as_me: creating $ac_file" >&6;}
     for f in $ac_file_in; do
       case $f in
       -) echo $tmp/stdin ;;
-      [\\/$]* | ?:[\\/]*)
-         # Absolute
-         test -f "$f" || { { echo "$as_me:22535: error: cannot find input file: $f" >&5
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:27651: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -22545,7 +27661,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:22548: error: cannot find input file: $f" >&5
+           { { echo "$as_me:27664: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -22606,7 +27722,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:22609: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:27725: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -22615,9 +27731,9 @@ echo "$as_me: creating $ac_file" >&6;}
     for f in $ac_file_in; do
       case $f in
       -) echo $tmp/stdin ;;
-      [\\/$]* | ?:[\\/]*)
-         # Absolute
-         test -f "$f" || { { echo "$as_me:22620: error: cannot find input file: $f" >&5
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:27736: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -22630,7 +27746,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:22633: error: cannot find input file: $f" >&5
+           { { echo "$as_me:27749: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -22747,7 +27863,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:22750: $ac_file is unchanged" >&5
+      { echo "$as_me:27866: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -22798,7 +27914,7 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   case $ac_dest in
-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h ;;
+    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp >	   include/stamp-h ;;
     default-2 )
 test x"$AMDEP" != x"" ||
 for mf in $CONFIG_FILES; do
@@ -22844,12 +27960,28 @@ EOF
 
 cat >>$CONFIG_STATUS <<\EOF
 
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test "$no_create" = yes || $SHELL $CONFIG_STATUS || { (exit 1); exit 1; }
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || 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
 
 HEIMDALVERSION="$PACKAGE-$VERSION"
 
diff --git a/kerberosV/src/kadmin/kadmin_locl.h b/kerberosV/src/kadmin/kadmin_locl.h
index 460989ea611..a36defb23e3 100644
--- a/kerberosV/src/kadmin/kadmin_locl.h
+++ b/kerberosV/src/kadmin/kadmin_locl.h
@@ -87,7 +87,7 @@
 #include <err.h>
 #include <roken.h>
 #ifdef HAVE_OPENSSL
-#include <openssl/des.h>
+#include <des.h>
 #else
 #include <des.h>
 #endif
diff --git a/kerberosV/src/kdc/headers.h b/kerberosV/src/kdc/headers.h
index 894bbf43e07..ce7e59b019c 100644
--- a/kerberosV/src/kdc/headers.h
+++ b/kerberosV/src/kdc/headers.h
@@ -87,7 +87,7 @@
 #include <parse_units.h>
 /* openssl/des.h does not have des_random_key, so we don't use it */
 #ifdef HAVE_OPENSSL
-#include <openssl/des.h>
+#include <des.h>
 #else
 #include <des.h>
 #endif
diff --git a/kerberosV/src/kpasswd/kpasswd_locl.h b/kerberosV/src/kpasswd/kpasswd_locl.h
index bd937dcb69b..c56a6d7712f 100644
--- a/kerberosV/src/kpasswd/kpasswd_locl.h
+++ b/kerberosV/src/kpasswd/kpasswd_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $KTH: kpasswd_locl.h,v 1.9 2000/08/04 11:22:51 joda Exp $ */
+/* $KTH: kpasswd_locl.h,v 1.12 2001/08/22 20:30:26 assar Exp $ */
 
 #ifndef __KPASSWD_LOCL_H__
 #define __KPASSWD_LOCL_H__
@@ -92,10 +92,17 @@
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #include <err.h>
 #include <roken.h>
 #include <getarg.h>
+#ifdef HAVE_OPENSSL
+#include <des.h>
+#else
 #include <des.h>
+#endif
 #include <krb5.h>
 
 #endif /* __KPASSWD_LOCL_H__ */
diff --git a/kerberosV/src/lib/hdb/hdb_locl.h b/kerberosV/src/lib/hdb/hdb_locl.h
index 4400a29cecd..a2457ec69d0 100644
--- a/kerberosV/src/lib/hdb/hdb_locl.h
+++ b/kerberosV/src/lib/hdb/hdb_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $KTH: hdb_locl.h,v 1.14 2000/11/14 06:57:17 assar Exp $ */
+/* $KTH: hdb_locl.h,v 1.17 2001/08/22 20:30:28 assar Exp $ */
 
 #ifndef __HDB_LOCL_H__
 #define __HDB_LOCL_H__
@@ -56,31 +56,13 @@
 #endif
 #include <roken.h>
 
+#ifdef HAVE_OPENSSL
 #include <des.h>
+#else
+#include <des.h>
+#endif
 #include <krb5.h>
 #include <hdb.h>
 #include <hdb-private.h>
 
-#if defined(HAVE_DB_185_H)
-#include <db_185.h>
-#elif defined(HAVE_DB_H)
-#include <db.h>
-#endif
-
-#if defined(HAVE_NDBM_H)
-#include <ndbm.h>
-#elif defined(HAVE_GDBM_NDBM_H)
-#include <gdbm/ndbm.h>
-#endif
-
-int hdb_principal2key(krb5_context, krb5_principal, krb5_data*);
-int hdb_key2principal(krb5_context, krb5_data*, krb5_principal);
-
-krb5_error_code hdb_lock(int, int);
-krb5_error_code hdb_unlock(int);
-
-krb5_error_code _hdb_fetch(krb5_context, HDB*, unsigned, hdb_entry*);
-krb5_error_code _hdb_store(krb5_context, HDB*, unsigned, hdb_entry*);
-krb5_error_code _hdb_remove(krb5_context, HDB*, hdb_entry*);
-
 #endif /* __HDB_LOCL_H__ */
diff --git a/kerberosV/src/lib/krb5/krb5_locl.h b/kerberosV/src/lib/krb5/krb5_locl.h
index 300a65051a7..ca905b93778 100644
--- a/kerberosV/src/lib/krb5/krb5_locl.h
+++ b/kerberosV/src/lib/krb5/krb5_locl.h
@@ -110,7 +110,7 @@ struct sockaddr_dl;
 #include <base64.h>
 
 #ifdef HAVE_OPENSSL
-#include <openssl/des.h>
+#include <des.h>
 #include <openssl/md4.h>
 #include <openssl/md5.h>
 #include <openssl/sha.h>