1 files changed, 2538 insertions, 1694 deletions
diff --git a/configure b/configure
index 5c78dac53..c39957b7c 100755
--- a/configure
+++ b/configure
@@ -682,17 +682,18 @@ Optional Features:
 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-rpath         Disable auto-added -R linker paths
  --with-osfsia           Enable Digital Unix SIA
  --with-cflags           Specify additional flags to pass to compiler
  --with-cppflags         Specify additional flags to pass to preprocessor
  --with-ldflags          Specify additional flags to pass to linker
  --with-libs             Specify additional libraries to link with
-  --without-rpath         Disable auto-added -R linker paths
  --with-zlib=PATH        Use zlib in PATH
+  --without-zlib-version-check Disable zlib version check
  --with-skey[=PATH]      Enable S/Key support
-                            (optionally in PATH)
+                            (optionally in PATH)
  --with-tcp-wrappers[=PATH]      Enable tcpwrappers support
-                            (optionally in PATH)
+                            (optionally in PATH)
  --with-pam              Enable PAM support
  --with-ssl-dir=PATH     Specify path to OpenSSL installation
  --with-rand-helper      Use subprocess to gather strong randomness
@@ -702,7 +703,6 @@ Optional Packages:
  --with-privsep-user=user Specify non-privileged user for privilege separation
  --with-sectok           Enable smartcard support using libsectok
  --with-opensc=PFX       Enable smartcard support using OpenSC
-  --with-dns              Support for fetching keys from DNS (experimental)
  --with-kerberos5=PATH   Enable Kerberos 5 support
  --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty)
  --with-xauth=PATH       Specify path to xauth program
@@ -2946,11 +2946,55 @@ EOF
        fi
 fi
+# Extract the first word of "passwd", so it can be a program name with args.
+set dummy passwd; ac_word=$2
+echo "$as_me:2951: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PATH_PASSWD_PROG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PATH_PASSWD_PROG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PATH_PASSWD_PROG="$PATH_PASSWD_PROG" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_PATH_PASSWD_PROG="$ac_dir/$ac_word"
+   echo "$as_me:2968: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+  ;;
+esac
+fi
+PATH_PASSWD_PROG=$ac_cv_path_PATH_PASSWD_PROG
+if test -n "$PATH_PASSWD_PROG"; then
+  echo "$as_me:2979: result: $PATH_PASSWD_PROG" >&5
+echo "${ECHO_T}$PATH_PASSWD_PROG" >&6
+else
+  echo "$as_me:2982: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+if test ! -z "$PATH_PASSWD_PROG" ; then
+        cat >>confdefs.h <<EOF
+#define _PATH_PASSWD_PROG "$PATH_PASSWD_PROG"
+EOF
+fi
 if test -z "$LD" ; then
        LD=$CC
 fi
-echo "$as_me:2953: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2997: 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
@@ -2958,7 +3002,7 @@ else
  ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2961 "configure"
+#line 3005 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3007,16 +3051,16 @@ 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:3010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3054: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:3013: \$? = $ac_status" >&5
+  echo "$as_me:3057: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3060: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3019: \$? = $ac_status" >&5
+  echo "$as_me:3063: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3033,15 +3077,15 @@ fi
 case "x$ac_cv_prog_cc_stdc" in
  x|xno)
-    echo "$as_me:3036: result: none needed" >&5
+    echo "$as_me:3080: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
  *)
-    echo "$as_me:3039: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3083: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
-echo "$as_me:3044: checking for inline" >&5
+echo "$as_me:3088: 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
@@ -3049,7 +3093,7 @@ else
  ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
  cat >conftest.$ac_ext <<_ACEOF
-#line 3052 "configure"
+#line 3096 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -3058,16 +3102,16 @@ $ac_kw int foo () {return 0; }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3061: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3105: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:3064: \$? = $ac_status" >&5
+  echo "$as_me:3108: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3111: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3070: \$? = $ac_status" >&5
+  echo "$as_me:3114: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_c_inline=$ac_kw; break
 else
@@ -3078,7 +3122,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 fi
-echo "$as_me:3081: result: $ac_cv_c_inline" >&5
+echo "$as_me:3125: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
  inline | yes) ;;
@@ -3097,22 +3141,33 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
        CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
 fi
+# Check whether --with-rpath or --without-rpath was given.
+if test "${with_rpath+set}" = set; then
+  withval="$with_rpath"
+                if test "x$withval" = "xno" ; then
+                        need_dash_r=""
+                fi
+                if test "x$withval" = "xyes" ; then
+                        need_dash_r=1
+                fi
+fi;
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+        echo "$as_me:3160: checking how to specify blibpath for linker ($LD)" >&5
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-        echo "$as_me:3105: checking how to specify blibpath for linker ($LD)" >&5
 echo $ECHO_N "checking how to specify blibpath for linker ($LD)... $ECHO_C" >&6
        if (test -z "$blibpath"); then
-                blibpath="/usr/lib:/lib:/usr/local/lib"
+                blibpath="/usr/lib:/lib"
        fi
        saved_LDFLAGS="$LDFLAGS"
        for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
                if (test -z "$blibflags"); then
                        LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
                        cat >conftest.$ac_ext <<_ACEOF
-#line 3115 "configure"
+#line 3170 "configure"
 #include "confdefs.h"
 int
@@ -3124,16 +3179,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3182: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3130: \$? = $ac_status" >&5
+  echo "$as_me:3185: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3188: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3136: \$? = $ac_status" >&5
+  echo "$as_me:3191: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  blibflags=$tryflags
 else
@@ -3144,23 +3199,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                fi
        done
        if (test -z "$blibflags"); then
-                echo "$as_me:3147: result: not found" >&5
+                echo "$as_me:3202: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:3149: error: *** must be able to specify blibpath on AIX - check config.log" >&5
+                { { echo "$as_me:3204: error: *** must be able to specify blibpath on AIX - check config.log" >&5
 echo "$as_me: error: *** must be able to specify blibpath on AIX - check config.log" >&2;}
   { (exit 1); exit 1; }; }
        else
-                echo "$as_me:3153: result: $blibflags" >&5
+                echo "$as_me:3208: result: $blibflags" >&5
 echo "${ECHO_T}$blibflags" >&6
        fi
        LDFLAGS="$saved_LDFLAGS"
-                echo "$as_me:3157: checking for authenticate" >&5
+                echo "$as_me:3212: checking for authenticate" >&5
 echo $ECHO_N "checking for authenticate... $ECHO_C" >&6
 if test "${ac_cv_func_authenticate+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 3163 "configure"
+#line 3218 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char authenticate (); below.  */
@@ -3191,16 +3246,16 @@ f = authenticate;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3249: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3197: \$? = $ac_status" >&5
+  echo "$as_me:3252: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3255: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3203: \$? = $ac_status" >&5
+  echo "$as_me:3258: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_authenticate=yes
 else
@@ -3210,7 +3265,7 @@ ac_cv_func_authenticate=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3213: result: $ac_cv_func_authenticate" >&5
+echo "$as_me:3268: result: $ac_cv_func_authenticate" >&5
 echo "${ECHO_T}$ac_cv_func_authenticate" >&6
 if test $ac_cv_func_authenticate = yes; then
  cat >>confdefs.h <<\EOF
@@ -3218,7 +3273,7 @@ if test $ac_cv_func_authenticate = yes; then
 EOF
 else
-  echo "$as_me:3221: checking for authenticate in -ls" >&5
+  echo "$as_me:3276: checking for authenticate in -ls" >&5
 echo $ECHO_N "checking for authenticate in -ls... $ECHO_C" >&6
 if test "${ac_cv_lib_s_authenticate+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3226,7 +3281,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ls  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3229 "configure"
+#line 3284 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3245,16 +3300,16 @@ authenticate ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3303: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3251: \$? = $ac_status" >&5
+  echo "$as_me:3306: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3309: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3257: \$? = $ac_status" >&5
+  echo "$as_me:3312: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_s_authenticate=yes
 else
@@ -3265,7 +3320,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3268: result: $ac_cv_lib_s_authenticate" >&5
+echo "$as_me:3323: result: $ac_cv_lib_s_authenticate" >&5
 echo "${ECHO_T}$ac_cv_lib_s_authenticate" >&6
 if test $ac_cv_lib_s_authenticate = yes; then
   cat >>confdefs.h <<\EOF
@@ -3278,13 +3333,13 @@ fi
 fi
-                echo "$as_me:3281: checking whether loginfailed is declared" >&5
+                echo "$as_me:3336: checking whether loginfailed is declared" >&5
 echo $ECHO_N "checking whether loginfailed is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_loginfailed+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 3287 "configure"
+#line 3342 "configure"
 #include "confdefs.h"
 #include <usersec.h>
@@ -3300,16 +3355,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3358: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:3306: \$? = $ac_status" >&5
+  echo "$as_me:3361: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3364: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3312: \$? = $ac_status" >&5
+  echo "$as_me:3367: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_loginfailed=yes
 else
@@ -3319,13 +3374,13 @@ ac_cv_have_decl_loginfailed=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3322: result: $ac_cv_have_decl_loginfailed" >&5
+echo "$as_me:3377: result: $ac_cv_have_decl_loginfailed" >&5
 echo "${ECHO_T}$ac_cv_have_decl_loginfailed" >&6
 if test $ac_cv_have_decl_loginfailed = yes; then
-  echo "$as_me:3325: checking if loginfailed takes 4 arguments" >&5
+  echo "$as_me:3380: checking if loginfailed takes 4 arguments" >&5
 echo $ECHO_N "checking if loginfailed takes 4 arguments... $ECHO_C" >&6
                  cat >conftest.$ac_ext <<_ACEOF
-#line 3328 "configure"
+#line 3383 "configure"
 #include "confdefs.h"
 #include <usersec.h>
 int
@@ -3337,18 +3392,18 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3395: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:3343: \$? = $ac_status" >&5
+  echo "$as_me:3398: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3401: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3349: \$? = $ac_status" >&5
+  echo "$as_me:3404: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:3351: result: yes" >&5
+  echo "$as_me:3406: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                         cat >>confdefs.h <<\EOF
 #define AIX_LOGINFAILED_4ARG 1
@@ -3357,7 +3412,7 @@ EOF
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3360: result: no" >&5
+echo "$as_me:3415: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -3367,13 +3422,13 @@ fi
 for ac_func in setauthdb
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3370: checking for $ac_func" >&5
+echo "$as_me:3425: 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 3376 "configure"
+#line 3431 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -3404,16 +3459,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3462: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3410: \$? = $ac_status" >&5
+  echo "$as_me:3465: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3468: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3416: \$? = $ac_status" >&5
+  echo "$as_me:3471: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -3423,7 +3478,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3426: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:3481: 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
@@ -3507,16 +3562,28 @@ EOF
 #define IP_TOS_IS_BROKEN 1
 EOF
+        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
        ;;
 *-*-darwin*)
-        echo "$as_me:3512: checking if we have working getaddrinfo" >&5
+        echo "$as_me:3579: checking if we have working getaddrinfo" >&5
 echo $ECHO_N "checking if we have working getaddrinfo... $ECHO_C" >&6
        if test "$cross_compiling" = yes; then
-  echo "$as_me:3515: result: assume it is working" >&5
+  echo "$as_me:3582: result: assume it is working" >&5
 echo "${ECHO_T}assume it is working" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 3519 "configure"
+#line 3586 "configure"
 #include "confdefs.h"
 #include <mach-o/dyld.h>
 main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
@@ -3526,23 +3593,23 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3596: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3532: \$? = $ac_status" >&5
+  echo "$as_me:3599: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3601: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3537: \$? = $ac_status" >&5
+  echo "$as_me:3604: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:3539: result: working" >&5
+  echo "$as_me:3606: result: working" >&5
 echo "${ECHO_T}working" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3545: result: buggy" >&5
+echo "$as_me:3612: result: buggy" >&5
 echo "${ECHO_T}buggy" >&6
        cat >>confdefs.h <<\EOF
 #define BROKEN_GETADDRINFO 1
@@ -3563,6 +3630,10 @@ EOF
 #define BROKEN_SETREGID 1
 EOF
+        cat >>confdefs.h <<EOF
+#define BIND_8_COMPAT 1
+EOF
        ;;
 *-*-hpux10.26)
        if test -z "$GCC"; then
@@ -3587,14 +3658,6 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
-EOF
-        cat >>confdefs.h <<\EOF
-#define DISABLE_UTMP 1
-EOF
-        cat >>confdefs.h <<\EOF
 #define LOCKED_PASSWD_STRING "*"
 EOF
@@ -3604,7 +3667,7 @@ EOF
        LIBS="$LIBS -lsec -lsecpw"
-echo "$as_me:3607: checking for t_error in -lxnet" >&5
+echo "$as_me:3670: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3612,7 +3675,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3615 "configure"
+#line 3678 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3631,16 +3694,16 @@ t_error ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3697: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3637: \$? = $ac_status" >&5
+  echo "$as_me:3700: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3703: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3643: \$? = $ac_status" >&5
+  echo "$as_me:3706: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_xnet_t_error=yes
 else
@@ -3651,7 +3714,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3654: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3717: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
  cat >>confdefs.h <<EOF
@@ -3661,7 +3724,7 @@ EOF
  LIBS="-lxnet $LIBS"
 else
-  { { echo "$as_me:3664: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3727: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
   { (exit 1); exit 1; }; }
 fi
@@ -3687,14 +3750,6 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
-EOF
-        cat >>confdefs.h <<\EOF
-#define DISABLE_UTMP 1
-EOF
-        cat >>confdefs.h <<\EOF
 #define LOCKED_PASSWD_STRING "*"
 EOF
@@ -3704,7 +3759,7 @@ EOF
        LIBS="$LIBS -lsec"
-echo "$as_me:3707: checking for t_error in -lxnet" >&5
+echo "$as_me:3762: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3712,7 +3767,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3715 "configure"
+#line 3770 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3731,16 +3786,16 @@ t_error ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3789: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3737: \$? = $ac_status" >&5
+  echo "$as_me:3792: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3795: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3743: \$? = $ac_status" >&5
+  echo "$as_me:3798: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_xnet_t_error=yes
 else
@@ -3751,7 +3806,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3754: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3809: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
  cat >>confdefs.h <<EOF
@@ -3761,7 +3816,7 @@ EOF
  LIBS="-lxnet $LIBS"
 else
-  { { echo "$as_me:3764: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3819: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
   { (exit 1); exit 1; }; }
 fi
@@ -3787,10 +3842,6 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
-#define DISABLE_SHADOW 1
-EOF
-        cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
 EOF
@@ -3802,9 +3853,16 @@ EOF
 #define SPT_TYPE SPT_PSTAT
 EOF
+        case "$host" in
+        *-*-hpux11.11*)
+                cat >>confdefs.h <<\EOF
+#define BROKEN_GETADDRINFO 1
+EOF
+;;
+        esac
        LIBS="$LIBS -lsec"
-echo "$as_me:3807: checking for t_error in -lxnet" >&5
+echo "$as_me:3865: checking for t_error in -lxnet" >&5
 echo $ECHO_N "checking for t_error in -lxnet... $ECHO_C" >&6
 if test "${ac_cv_lib_xnet_t_error+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3812,7 +3870,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3815 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3831,16 +3889,16 @@ t_error ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3892: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3837: \$? = $ac_status" >&5
+  echo "$as_me:3895: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3898: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3843: \$? = $ac_status" >&5
+  echo "$as_me:3901: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_xnet_t_error=yes
 else
@@ -3851,7 +3909,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3854: result: $ac_cv_lib_xnet_t_error" >&5
+echo "$as_me:3912: result: $ac_cv_lib_xnet_t_error" >&5
 echo "${ECHO_T}$ac_cv_lib_xnet_t_error" >&6
 if test $ac_cv_lib_xnet_t_error = yes; then
  cat >>confdefs.h <<EOF
@@ -3861,21 +3919,31 @@ EOF
  LIBS="-lxnet $LIBS"
 else
-  { { echo "$as_me:3864: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
+  { { echo "$as_me:3922: error: *** -lxnet needed on HP-UX - check config.log ***" >&5
 echo "$as_me: error: *** -lxnet needed on HP-UX - check config.log ***" >&2;}
   { (exit 1); exit 1; }; }
 fi
        ;;
 *-*-irix5*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
        cat >>confdefs.h <<\EOF
 #define BROKEN_INET_NTOA 1
 EOF
        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define WITH_ABBREV_NO_TTY 1
 EOF
@@ -3885,8 +3953,6 @@ EOF
        ;;
 *-*-irix6*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS"
        PATH="$PATH:/usr/etc"
        cat >>confdefs.h <<\EOF
 #define WITH_IRIX_ARRAY 1
@@ -3900,13 +3966,13 @@ EOF
 #define WITH_IRIX_AUDIT 1
 EOF
-        echo "$as_me:3903: checking for jlimit_startjob" >&5
+        echo "$as_me:3969: checking for jlimit_startjob" >&5
 echo $ECHO_N "checking for jlimit_startjob... $ECHO_C" >&6
 if test "${ac_cv_func_jlimit_startjob+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 3909 "configure"
+#line 3975 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char jlimit_startjob (); below.  */
@@ -3937,16 +4003,16 @@ f = jlimit_startjob;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4006: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:3943: \$? = $ac_status" >&5
+  echo "$as_me:4009: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4012: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:3949: \$? = $ac_status" >&5
+  echo "$as_me:4015: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_jlimit_startjob=yes
 else
@@ -3956,7 +4022,7 @@ ac_cv_func_jlimit_startjob=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3959: result: $ac_cv_func_jlimit_startjob" >&5
+echo "$as_me:4025: result: $ac_cv_func_jlimit_startjob" >&5
 echo "${ECHO_T}$ac_cv_func_jlimit_startjob" >&6
 if test $ac_cv_func_jlimit_startjob = yes; then
  cat >>confdefs.h <<\EOF
@@ -4029,7 +4095,9 @@ EOF
        ;;
 *-*-netbsd*)
        check_for_libcrypt_before=1
-        need_dash_r=1
+        if test "x$withval" != "xno" ; then
+                need_dash_r=1
+        fi
        ;;
 *-*-freebsd*)
        check_for_libcrypt_later=1
@@ -4069,13 +4137,8 @@ EOF
 #define BROKEN_SAVED_UIDS 1
 EOF
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        CFLAGS="$CFLAGS"
        ;;
 *-*-solaris*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
-        need_dash_r=1
        cat >>confdefs.h <<\EOF
 #define PAM_SUN_CODEBASE 1
 EOF
@@ -4104,11 +4167,11 @@ EOF
        external_path_file=/etc/default/login
        # hardwire lastlog location (can't detect it on some versions)
        conf_lastlog_location="/var/adm/lastlog"
-        echo "$as_me:4107: checking for obsolete utmp and wtmp in solaris2.x" >&5
+        echo "$as_me:4170: checking for obsolete utmp and wtmp in solaris2.x" >&5
 echo $ECHO_N "checking for obsolete utmp and wtmp in solaris2.x... $ECHO_C" >&6
        sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'`
        if test "$sol2ver" -ge 8; then
-                echo "$as_me:4111: result: yes" >&5
+                echo "$as_me:4174: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define DISABLE_UTMP 1
@@ -4119,7 +4182,7 @@ EOF
 EOF
        else
-                echo "$as_me:4122: result: no" >&5
+                echo "$as_me:4185: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
        ;;
@@ -4129,13 +4192,13 @@ echo "${ECHO_T}no" >&6
 for ac_func in getpwanam
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4132: checking for $ac_func" >&5
+echo "$as_me:4195: 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 4138 "configure"
+#line 4201 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4166,16 +4229,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4232: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4172: \$? = $ac_status" >&5
+  echo "$as_me:4235: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4238: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4178: \$? = $ac_status" >&5
+  echo "$as_me:4241: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4185,7 +4248,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4188: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4251: 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
@@ -4208,8 +4271,6 @@ EOF
        ;;
 *-ncr-sysv*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        LIBS="$LIBS -lc89"
        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
@@ -4233,9 +4294,66 @@ EOF
        ;;
 *-sni-sysv*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
        # /usr/ucblib MUST NOT be searched on ReliantUNIX
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+echo "$as_me:4299: checking for dlsym in -ldl" >&5
+echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlsym+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 4307 "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 dlsym ();
+int
+main ()
+{
+dlsym ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4326: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4329: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4332: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4335: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlsym=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dl_dlsym=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:4346: result: $ac_cv_lib_dl_dlsym" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
+if test $ac_cv_lib_dl_dlsym = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBDL 1
+EOF
+  LIBS="-ldl $LIBS"
+fi
        IPADDR_IN_DISPLAY=yes
        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
@@ -4246,6 +4364,18 @@ EOF
 EOF
        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define SSHD_ACQUIRES_CTTY 1
 EOF
@@ -4255,8 +4385,6 @@ EOF
        # otherwise you will find lots of "SIOCGPGRP errno 22" on syslog
        ;;
 *-*-sysv4.2*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
 EOF
@@ -4275,8 +4403,6 @@ EOF
        ;;
 *-*-sysv5*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
 EOF
@@ -4295,13 +4421,10 @@ EOF
        ;;
 *-*-sysv*)
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        ;;
 *-*-sco3.2v4*)
-        CPPFLAGS="$CPPFLAGS -Dftruncate=chsize -I/usr/local/include"
+        CPPFLAGS="$CPPFLAGS -Dftruncate=chsize"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        LIBS="$LIBS -los -lprot -lcrypt_i -lx -ltinfo -lm"
-        LIBS="$LIBS -los -lprot -lx -ltinfo -lm"
        RANLIB=true
        no_dev_ptmx=1
        cat >>confdefs.h <<\EOF
@@ -4331,13 +4454,13 @@ EOF
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4334: checking for $ac_func" >&5
+echo "$as_me:4457: 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 4340 "configure"
+#line 4463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4368,16 +4491,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4494: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4374: \$? = $ac_status" >&5
+  echo "$as_me:4497: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4500: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4380: \$? = $ac_status" >&5
+  echo "$as_me:4503: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4387,7 +4510,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4390: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4513: 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
@@ -4404,8 +4527,6 @@ done
        if test -z "$GCC"; then
                CFLAGS="$CFLAGS -belf"
        fi
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        LIBS="$LIBS -lprot -lx -ltinfo -lm"
        no_dev_ptmx=1
        cat >>confdefs.h <<\EOF
@@ -4443,13 +4564,13 @@ EOF
 for ac_func in getluid setluid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:4446: checking for $ac_func" >&5
+echo "$as_me:4567: 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 4452 "configure"
+#line 4573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -4480,16 +4601,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4604: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4486: \$? = $ac_status" >&5
+  echo "$as_me:4607: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4610: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4492: \$? = $ac_status" >&5
+  echo "$as_me:4613: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -4499,7 +4620,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4502: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4623: 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
@@ -4513,6 +4634,22 @@ done
        ;;
 *-*-unicosmk*)
        cat >>confdefs.h <<\EOF
+#define NO_SSH_LASTLOG 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
 EOF
@@ -4526,6 +4663,18 @@ EOF
        ;;
 *-*-unicosmp*)
        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define WITH_ABBREV_NO_TTY 1
 EOF
@@ -4538,11 +4687,23 @@ EOF
 EOF
        LDFLAGS="$LDFLAGS"
-        LIBS="$LIBS -lgen -lacid"
+        LIBS="$LIBS -lgen -lacid -ldb"
        MANTYPE=cat
        ;;
 *-*-unicos*)
        cat >>confdefs.h <<\EOF
+#define SETEUID_BREAKS_SETUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREUID 1
+EOF
+        cat >>confdefs.h <<\EOF
+#define BROKEN_SETREGID 1
+EOF
+        cat >>confdefs.h <<\EOF
 #define USE_PIPES 1
 EOF
@@ -4559,7 +4720,7 @@ EOF
        MANTYPE=cat
        ;;
 *-dec-osf*)
-        echo "$as_me:4562: checking for Digital Unix SIA" >&5
+        echo "$as_me:4723: checking for Digital Unix SIA" >&5
 echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6
        no_osfsia=""
@@ -4568,7 +4729,7 @@ if test "${with_osfsia+set}" = set; then
  withval="$with_osfsia"
                        if test "x$withval" = "xno" ; then
-                                echo "$as_me:4571: result: disabled" >&5
+                                echo "$as_me:4732: result: disabled" >&5
 echo "${ECHO_T}disabled" >&6
                                no_osfsia=1
                        fi
@@ -4576,7 +4737,7 @@ echo "${ECHO_T}disabled" >&6
 fi;
        if test -z "$no_osfsia" ; then
                if test -f /etc/sia/matrix.conf; then
-                        echo "$as_me:4579: result: yes" >&5
+                        echo "$as_me:4740: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        cat >>confdefs.h <<\EOF
 #define HAVE_OSF_SIA 1
@@ -4592,14 +4753,14 @@ EOF
                        LIBS="$LIBS -lsecurity -ldb -lm -laud"
                else
-                        echo "$as_me:4595: result: no" >&5
+                        echo "$as_me:4756: result: no" >&5
 echo "${ECHO_T}no" >&6
-                fi
+                        cat >>confdefs.h <<\EOF
-        fi
+#define LOCKED_PASSWD_SUBSTR "Nologin"
-        cat >>confdefs.h <<\EOF
-#define DISABLE_FD_PASSING 1
 EOF
+                fi
+        fi
        cat >>confdefs.h <<\EOF
 #define BROKEN_GETADDRINFO 1
 EOF
@@ -4616,10 +4777,6 @@ EOF
 #define BROKEN_SETREGID 1
 EOF
-        cat >>confdefs.h <<\EOF
-#define LOCKED_PASSWD_SUBSTR "Nologin"
-EOF
        ;;
 *-*-nto-qnx)
@@ -4688,15 +4845,15 @@ if test "${with_libs+set}" = set; then
 fi;
-echo "$as_me:4691: checking compiler and flags for sanity" >&5
+echo "$as_me:4848: checking compiler and flags for sanity" >&5
 echo $ECHO_N "checking compiler and flags for sanity... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:4694: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:4851: 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 4699 "configure"
+#line 4856 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -4704,26 +4861,26 @@ int main(){exit(0);}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4707: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4864: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4710: \$? = $ac_status" >&5
+  echo "$as_me:4867: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4869: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4715: \$? = $ac_status" >&5
+  echo "$as_me:4872: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-        echo "$as_me:4717: result: yes" >&5
+        echo "$as_me:4874: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:4724: result: no" >&5
+                echo "$as_me:4881: result: no" >&5
 echo "${ECHO_T}no" >&6
-                { { echo "$as_me:4726: error: *** compiler cannot create working executables, check config.log ***" >&5
+                { { echo "$as_me:4883: error: *** compiler cannot create working executables, check config.log ***" >&5
 echo "$as_me: error: *** compiler cannot create working executables, check config.log ***" >&2;}
   { (exit 1); exit 1; }; }
@@ -4736,32 +4893,32 @@ fi
 for ac_header in bstring.h crypt.h endian.h features.h floatingpoint.h \
        getopt.h glob.h ia.h lastlog.h limits.h login.h \
        login_cap.h maillock.h netdb.h netgroup.h \
-        netinet/in_systm.h paths.h pty.h readpassphrase.h \
+        netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \
        rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
        strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
-        sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
+        sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \
-        sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
+        sys/stream.h sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
        sys/un.h time.h tmpdir.h ttyent.h usersec.h \
        util.h utime.h utmp.h utmpx.h vis.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4748: checking for $ac_header" >&5
+echo "$as_me:4905: 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 4754 "configure"
+#line 4911 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4758: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4915: \"$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:4764: \$? = $ac_status" >&5
+  echo "$as_me:4921: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4780,7 +4937,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4783: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4940: 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
@@ -4791,13 +4948,13 @@ fi
 done
 # Checks for libraries.
-echo "$as_me:4794: checking for yp_match" >&5
+echo "$as_me:4951: checking for yp_match" >&5
 echo $ECHO_N "checking for yp_match... $ECHO_C" >&6
 if test "${ac_cv_func_yp_match+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 4800 "configure"
+#line 4957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char yp_match (); below.  */
@@ -4828,16 +4985,16 @@ f = yp_match;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4988: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4834: \$? = $ac_status" >&5
+  echo "$as_me:4991: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4994: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4840: \$? = $ac_status" >&5
+  echo "$as_me:4997: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_yp_match=yes
 else
@@ -4847,13 +5004,13 @@ ac_cv_func_yp_match=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4850: result: $ac_cv_func_yp_match" >&5
+echo "$as_me:5007: result: $ac_cv_func_yp_match" >&5
 echo "${ECHO_T}$ac_cv_func_yp_match" >&6
 if test $ac_cv_func_yp_match = yes; then
  :
 else
-echo "$as_me:4856: checking for yp_match in -lnsl" >&5
+echo "$as_me:5013: checking for yp_match in -lnsl" >&5
 echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_yp_match+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4861,7 +5018,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4864 "configure"
+#line 5021 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4880,16 +5037,16 @@ yp_match ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5040: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4886: \$? = $ac_status" >&5
+  echo "$as_me:5043: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5046: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4892: \$? = $ac_status" >&5
+  echo "$as_me:5049: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_nsl_yp_match=yes
 else
@@ -4900,7 +5057,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4903: result: $ac_cv_lib_nsl_yp_match" >&5
+echo "$as_me:5060: result: $ac_cv_lib_nsl_yp_match" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6
 if test $ac_cv_lib_nsl_yp_match = yes; then
  cat >>confdefs.h <<EOF
@@ -4913,13 +5070,13 @@ fi
 fi
-echo "$as_me:4916: checking for setsockopt" >&5
+echo "$as_me:5073: checking for setsockopt" >&5
 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_func_setsockopt+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 4922 "configure"
+#line 5079 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char setsockopt (); below.  */
@@ -4950,16 +5107,16 @@ f = setsockopt;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5110: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:4956: \$? = $ac_status" >&5
+  echo "$as_me:5113: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4959: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5116: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:4962: \$? = $ac_status" >&5
+  echo "$as_me:5119: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_setsockopt=yes
 else
@@ -4969,13 +5126,13 @@ ac_cv_func_setsockopt=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4972: result: $ac_cv_func_setsockopt" >&5
+echo "$as_me:5129: result: $ac_cv_func_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
 if test $ac_cv_func_setsockopt = yes; then
  :
 else
-echo "$as_me:4978: checking for setsockopt in -lsocket" >&5
+echo "$as_me:5135: checking for setsockopt in -lsocket" >&5
 echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4983,7 +5140,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4986 "configure"
+#line 5143 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5002,16 +5159,16 @@ setsockopt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5162: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5008: \$? = $ac_status" >&5
+  echo "$as_me:5165: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5168: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5014: \$? = $ac_status" >&5
+  echo "$as_me:5171: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_socket_setsockopt=yes
 else
@@ -5022,7 +5179,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5025: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "$as_me:5182: result: $ac_cv_lib_socket_setsockopt" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
 if test $ac_cv_lib_socket_setsockopt = yes; then
  cat >>confdefs.h <<EOF
@@ -5037,7 +5194,7 @@ fi
 if test "x$with_tcp_wrappers" != "xno" ; then
    if test "x$do_sco3_extra_lib_check" = "xyes" ; then
-        echo "$as_me:5040: checking for innetgr in -lrpc" >&5
+        echo "$as_me:5197: checking for innetgr in -lrpc" >&5
 echo $ECHO_N "checking for innetgr in -lrpc... $ECHO_C" >&6
 if test "${ac_cv_lib_rpc_innetgr+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5045,7 +5202,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrpc -lyp -lrpc $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5048 "configure"
+#line 5205 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5064,16 +5221,16 @@ innetgr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5224: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5070: \$? = $ac_status" >&5
+  echo "$as_me:5227: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5230: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5076: \$? = $ac_status" >&5
+  echo "$as_me:5233: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_rpc_innetgr=yes
 else
@@ -5084,7 +5241,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5087: result: $ac_cv_lib_rpc_innetgr" >&5
+echo "$as_me:5244: result: $ac_cv_lib_rpc_innetgr" >&5
 echo "${ECHO_T}$ac_cv_lib_rpc_innetgr" >&6
 if test $ac_cv_lib_rpc_innetgr = yes; then
  LIBS="-lrpc -lyp -lrpc $LIBS"
@@ -5096,13 +5253,13 @@ fi
 for ac_func in dirname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5099: checking for $ac_func" >&5
+echo "$as_me:5256: 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 5105 "configure"
+#line 5262 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -5133,16 +5290,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5293: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5139: \$? = $ac_status" >&5
+  echo "$as_me:5296: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5299: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5145: \$? = $ac_status" >&5
+  echo "$as_me:5302: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -5152,7 +5309,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5155: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5312: 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
@@ -5162,23 +5319,23 @@ EOF
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5165: checking for $ac_header" >&5
+echo "$as_me:5322: 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 5171 "configure"
+#line 5328 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5175: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5332: \"$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:5181: \$? = $ac_status" >&5
+  echo "$as_me:5338: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5197,7 +5354,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5200: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5357: 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
@@ -5209,7 +5366,7 @@ done
 else
-        echo "$as_me:5212: checking for dirname in -lgen" >&5
+        echo "$as_me:5369: checking for dirname in -lgen" >&5
 echo $ECHO_N "checking for dirname in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_dirname+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5217,7 +5374,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5220 "configure"
+#line 5377 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5236,16 +5393,16 @@ dirname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5396: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5242: \$? = $ac_status" >&5
+  echo "$as_me:5399: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5402: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5248: \$? = $ac_status" >&5
+  echo "$as_me:5405: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gen_dirname=yes
 else
@@ -5256,11 +5413,11 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5259: result: $ac_cv_lib_gen_dirname" >&5
+echo "$as_me:5416: result: $ac_cv_lib_gen_dirname" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_dirname" >&6
 if test $ac_cv_lib_gen_dirname = yes; then
-                echo "$as_me:5263: checking for broken dirname" >&5
+                echo "$as_me:5420: checking for broken dirname" >&5
 echo $ECHO_N "checking for broken dirname... $ECHO_C" >&6
 if test "${ac_cv_have_broken_dirname+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5269,12 +5426,12 @@ else
                        save_LIBS="$LIBS"
                        LIBS="$LIBS -lgen"
                        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:5272: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:5429: 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 5277 "configure"
+#line 5434 "configure"
 #include "confdefs.h"
 #include <libgen.h>
@@ -5294,15 +5451,15 @@ int main(int argc, char **argv) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5454: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5300: \$? = $ac_status" >&5
+  echo "$as_me:5457: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5459: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5305: \$? = $ac_status" >&5
+  echo "$as_me:5462: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_broken_dirname="no"
 else
@@ -5317,7 +5474,7 @@ fi
                        LIBS="$save_LIBS"
 fi
-echo "$as_me:5320: result: $ac_cv_have_broken_dirname" >&5
+echo "$as_me:5477: result: $ac_cv_have_broken_dirname" >&5
 echo "${ECHO_T}$ac_cv_have_broken_dirname" >&6
                if test "x$ac_cv_have_broken_dirname" = "xno" ; then
                        LIBS="$LIBS -lgen"
@@ -5328,23 +5485,23 @@ EOF
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5331: checking for $ac_header" >&5
+echo "$as_me:5488: 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 5337 "configure"
+#line 5494 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5341: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5498: \"$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:5347: \$? = $ac_status" >&5
+  echo "$as_me:5504: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5363,7 +5520,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5366: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5523: 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
@@ -5380,13 +5537,13 @@ fi
 fi
 done
-echo "$as_me:5383: checking for getspnam" >&5
+echo "$as_me:5540: checking for getspnam" >&5
 echo $ECHO_N "checking for getspnam... $ECHO_C" >&6
 if test "${ac_cv_func_getspnam+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 5389 "configure"
+#line 5546 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getspnam (); below.  */
@@ -5417,16 +5574,16 @@ f = getspnam;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5577: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5423: \$? = $ac_status" >&5
+  echo "$as_me:5580: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5583: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5429: \$? = $ac_status" >&5
+  echo "$as_me:5586: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getspnam=yes
 else
@@ -5436,12 +5593,12 @@ ac_cv_func_getspnam=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5439: result: $ac_cv_func_getspnam" >&5
+echo "$as_me:5596: result: $ac_cv_func_getspnam" >&5
 echo "${ECHO_T}$ac_cv_func_getspnam" >&6
 if test $ac_cv_func_getspnam = yes; then
  :
 else
-  echo "$as_me:5444: checking for getspnam in -lgen" >&5
+  echo "$as_me:5601: checking for getspnam in -lgen" >&5
 echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_getspnam+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5449,7 +5606,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5452 "configure"
+#line 5609 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5468,16 +5625,16 @@ getspnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5628: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5474: \$? = $ac_status" >&5
+  echo "$as_me:5631: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5634: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5480: \$? = $ac_status" >&5
+  echo "$as_me:5637: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gen_getspnam=yes
 else
@@ -5488,7 +5645,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5491: result: $ac_cv_lib_gen_getspnam" >&5
+echo "$as_me:5648: result: $ac_cv_lib_gen_getspnam" >&5
 echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6
 if test $ac_cv_lib_gen_getspnam = yes; then
  LIBS="$LIBS -lgen"
@@ -5496,7 +5653,7 @@ fi
 fi
-echo "$as_me:5499: checking for library containing basename" >&5
+echo "$as_me:5656: checking for library containing basename" >&5
 echo $ECHO_N "checking for library containing basename... $ECHO_C" >&6
 if test "${ac_cv_search_basename+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5504,7 +5661,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_basename=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5507 "configure"
+#line 5664 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5523,16 +5680,16 @@ basename ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5683: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5529: \$? = $ac_status" >&5
+  echo "$as_me:5686: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5689: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5535: \$? = $ac_status" >&5
+  echo "$as_me:5692: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_basename="none required"
 else
@@ -5544,7 +5701,7 @@ if test "$ac_cv_search_basename" = no; then
  for ac_lib in gen; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 5547 "configure"
+#line 5704 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5563,16 +5720,16 @@ basename ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5723: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5569: \$? = $ac_status" >&5
+  echo "$as_me:5726: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5729: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5575: \$? = $ac_status" >&5
+  echo "$as_me:5732: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_basename="-l$ac_lib"
 break
@@ -5585,7 +5742,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:5588: result: $ac_cv_search_basename" >&5
+echo "$as_me:5745: result: $ac_cv_search_basename" >&5
 echo "${ECHO_T}$ac_cv_search_basename" >&6
 if test "$ac_cv_search_basename" != no; then
  test "$ac_cv_search_basename" = "none required" || LIBS="$ac_cv_search_basename $LIBS"
@@ -5595,25 +5752,12 @@ EOF
 fi
-# Check whether --with-rpath or --without-rpath was given.
-if test "${with_rpath+set}" = set; then
-  withval="$with_rpath"
-                if test "x$withval" = "xno" ; then
-                        need_dash_r=""
-                fi
-                if test "x$withval" = "xyes" ; then
-                        need_dash_r=1
-                fi
-fi;
 # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
  withval="$with_zlib"
                if test "x$withval" = "xno" ; then
-                        { { echo "$as_me:5616: error: *** zlib is required ***" >&5
+                        { { echo "$as_me:5760: error: *** zlib is required ***" >&5
 echo "$as_me: error: *** zlib is required ***" >&2;}
   { (exit 1); exit 1; }; }
                fi
@@ -5638,7 +5782,7 @@ echo "$as_me: error: *** zlib is required ***" >&2;}
 fi;
-echo "$as_me:5641: checking for deflate in -lz" >&5
+echo "$as_me:5785: checking for deflate in -lz" >&5
 echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
 if test "${ac_cv_lib_z_deflate+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5646,7 +5790,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5649 "configure"
+#line 5793 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5665,16 +5809,16 @@ deflate ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5812: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5671: \$? = $ac_status" >&5
+  echo "$as_me:5815: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5818: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5677: \$? = $ac_status" >&5
+  echo "$as_me:5821: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_z_deflate=yes
 else
@@ -5685,7 +5829,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5688: result: $ac_cv_lib_z_deflate" >&5
+echo "$as_me:5832: result: $ac_cv_lib_z_deflate" >&5
 echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
 if test $ac_cv_lib_z_deflate = yes; then
  cat >>confdefs.h <<EOF
@@ -5695,18 +5839,192 @@ EOF
  LIBS="-lz $LIBS"
 else
-  { { echo "$as_me:5698: error: *** zlib missing - please install first or check config.log ***" >&5
+                saved_CPPFLAGS="$CPPFLAGS"
+                saved_LDFLAGS="$LDFLAGS"
+                save_LIBS="$LIBS"
+                                if test -n "${need_dash_r}"; then
+                        LDFLAGS="-L/usr/local/lib -R/usr/local/lib ${saved_LDFLAGS}"
+                else
+                        LDFLAGS="-L/usr/local/lib ${saved_LDFLAGS}"
+                fi
+                CPPFLAGS="-I/usr/local/include ${saved_CPPFLAGS}"
+                LIBS="$LIBS -lz"
+                cat >conftest.$ac_ext <<_ACEOF
+#line 5854 "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 deflate ();
+int
+main ()
+{
+deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5873: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5876: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5879: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5882: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cat >>confdefs.h <<\EOF
+#define HAVE_LIBZ 1
+EOF
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+                                { { echo "$as_me:5892: error: *** zlib missing - please install first or check config.log ***" >&5
 echo "$as_me: error: *** zlib missing - please install first or check config.log ***" >&2;}
   { (exit 1); exit 1; }; }
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5901: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5907 "configure"
+#include "confdefs.h"
+#include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:5911: \"$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:5917: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_zlib_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_header_zlib_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:5936: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+if test $ac_cv_header_zlib_h = yes; then
+  :
+else
+  { { echo "$as_me:5941: error: *** zlib.h missing - please install first or check config.log ***" >&5
+echo "$as_me: error: *** zlib.h missing - please install first or check config.log ***" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-echo "$as_me:5703: checking for strcasecmp" >&5
+# Check whether --with-zlib-version-check or --without-zlib-version-check was given.
+if test "${with_zlib_version_check+set}" = set; then
+  withval="$with_zlib_version_check"
+    if test "x$withval" = "xno" ; then
+                zlib_check_nonfatal=1
+           fi
+fi;
+echo "$as_me:5955: checking for zlib 1.1.4 or greater" >&5
+echo $ECHO_N "checking for zlib 1.1.4 or greater... $ECHO_C" >&6
+if test "$cross_compiling" = yes; then
+  { { echo "$as_me:5958: 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 5963 "configure"
+#include "confdefs.h"
+#include <zlib.h>
+int main()
+{
+        int a, b, c, v;
+        if (sscanf(ZLIB_VERSION, "%d.%d.%d", &a, &b, &c) != 3)
+                exit(1);
+        v = a*1000000 + b*1000 + c;
+        if (v >= 1001004)
+                exit(0);
+        exit(2);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:5980: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5983: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:5985: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5988: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:5990: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ echo "$as_me:5996: result: no" >&5
+echo "${ECHO_T}no" >&6
+          if test -z "$zlib_check_nonfatal" ; then
+                { { echo "$as_me:5999: error: *** zlib too old - check config.log ***
+Your reported zlib version has known security problems.  It's possible your
+vendor has fixed these problems without changing the version number.  If you
+are sure this is the case, you can disable the check by running
+\"./configure --without-zlib-version-check\".
+If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&5
+echo "$as_me: error: *** zlib too old - check config.log ***
+Your reported zlib version has known security problems.  It's possible your
+vendor has fixed these problems without changing the version number.  If you
+are sure this is the case, you can disable the check by running
+\"./configure --without-zlib-version-check\".
+If you are in doubt, upgrade zlib to version 1.1.4 or greater." >&2;}
+   { (exit 1); exit 1; }; }
+          else
+                { echo "$as_me:6013: WARNING: zlib version may have security problems" >&5
+echo "$as_me: WARNING: zlib version may have security problems" >&2;}
+          fi
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:6021: checking for strcasecmp" >&5
 echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6
 if test "${ac_cv_func_strcasecmp+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 5709 "configure"
+#line 6027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char strcasecmp (); below.  */
@@ -5737,16 +6055,16 @@ f = strcasecmp;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6058: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5743: \$? = $ac_status" >&5
+  echo "$as_me:6061: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5749: \$? = $ac_status" >&5
+  echo "$as_me:6067: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_strcasecmp=yes
 else
@@ -5756,12 +6074,12 @@ ac_cv_func_strcasecmp=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5759: result: $ac_cv_func_strcasecmp" >&5
+echo "$as_me:6077: result: $ac_cv_func_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6
 if test $ac_cv_func_strcasecmp = yes; then
  :
 else
-   echo "$as_me:5764: checking for strcasecmp in -lresolv" >&5
+   echo "$as_me:6082: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5769,7 +6087,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5772 "configure"
+#line 6090 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5788,16 +6106,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6109: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5794: \$? = $ac_status" >&5
+  echo "$as_me:6112: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6115: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5800: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -5808,7 +6126,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5811: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:6129: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
  LIBS="$LIBS -lresolv"
@@ -5816,13 +6134,13 @@ fi
 fi
-echo "$as_me:5819: checking for utimes" >&5
+echo "$as_me:6137: checking for utimes" >&5
 echo $ECHO_N "checking for utimes... $ECHO_C" >&6
 if test "${ac_cv_func_utimes+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 5825 "configure"
+#line 6143 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char utimes (); below.  */
@@ -5853,16 +6171,16 @@ f = utimes;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6174: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5859: \$? = $ac_status" >&5
+  echo "$as_me:6177: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6180: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5865: \$? = $ac_status" >&5
+  echo "$as_me:6183: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_utimes=yes
 else
@@ -5872,12 +6190,12 @@ ac_cv_func_utimes=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5875: result: $ac_cv_func_utimes" >&5
+echo "$as_me:6193: result: $ac_cv_func_utimes" >&5
 echo "${ECHO_T}$ac_cv_func_utimes" >&6
 if test $ac_cv_func_utimes = yes; then
  :
 else
-   echo "$as_me:5880: checking for utimes in -lc89" >&5
+   echo "$as_me:6198: checking for utimes in -lc89" >&5
 echo $ECHO_N "checking for utimes in -lc89... $ECHO_C" >&6
 if test "${ac_cv_lib_c89_utimes+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5885,7 +6203,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc89  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 5888 "configure"
+#line 6206 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5904,16 +6222,16 @@ utimes ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6225: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:5910: \$? = $ac_status" >&5
+  echo "$as_me:6228: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6231: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:5916: \$? = $ac_status" >&5
+  echo "$as_me:6234: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_c89_utimes=yes
 else
@@ -5924,7 +6242,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5927: result: $ac_cv_lib_c89_utimes" >&5
+echo "$as_me:6245: result: $ac_cv_lib_c89_utimes" >&5
 echo "${ECHO_T}$ac_cv_lib_c89_utimes" >&6
 if test $ac_cv_lib_c89_utimes = yes; then
  cat >>confdefs.h <<\EOF
@@ -5939,23 +6257,23 @@ fi
 for ac_header in libutil.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5942: checking for $ac_header" >&5
+echo "$as_me:6260: 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 5948 "configure"
+#line 6266 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5952: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6270: \"$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:5958: \$? = $ac_status" >&5
+  echo "$as_me:6276: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5974,7 +6292,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5977: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6295: 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
@@ -5984,7 +6302,7 @@ EOF
 fi
 done
-echo "$as_me:5987: checking for library containing login" >&5
+echo "$as_me:6305: checking for library containing login" >&5
 echo $ECHO_N "checking for library containing login... $ECHO_C" >&6
 if test "${ac_cv_search_login+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5992,7 +6310,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_login=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 5995 "configure"
+#line 6313 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6011,16 +6329,16 @@ login ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6014: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6332: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6017: \$? = $ac_status" >&5
+  echo "$as_me:6335: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6020: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6338: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6023: \$? = $ac_status" >&5
+  echo "$as_me:6341: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_login="none required"
 else
@@ -6032,7 +6350,7 @@ if test "$ac_cv_search_login" = no; then
  for ac_lib in util bsd; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 6035 "configure"
+#line 6353 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6051,16 +6369,16 @@ login ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6372: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6057: \$? = $ac_status" >&5
+  echo "$as_me:6375: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6378: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6063: \$? = $ac_status" >&5
+  echo "$as_me:6381: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_login="-l$ac_lib"
 break
@@ -6073,7 +6391,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6076: result: $ac_cv_search_login" >&5
+echo "$as_me:6394: result: $ac_cv_search_login" >&5
 echo "${ECHO_T}$ac_cv_search_login" >&6
 if test "$ac_cv_search_login" != no; then
  test "$ac_cv_search_login" = "none required" || LIBS="$ac_cv_search_login $LIBS"
@@ -6086,13 +6404,13 @@ fi
 for ac_func in logout updwtmp logwtmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6089: checking for $ac_func" >&5
+echo "$as_me:6407: 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 6095 "configure"
+#line 6413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6123,16 +6441,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6444: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6129: \$? = $ac_status" >&5
+  echo "$as_me:6447: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6450: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6135: \$? = $ac_status" >&5
+  echo "$as_me:6453: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6142,7 +6460,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6145: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6463: 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
@@ -6155,13 +6473,13 @@ done
 for ac_func in strftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6158: checking for $ac_func" >&5
+echo "$as_me:6476: 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 6164 "configure"
+#line 6482 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6192,16 +6510,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6513: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6198: \$? = $ac_status" >&5
+  echo "$as_me:6516: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6519: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6204: \$? = $ac_status" >&5
+  echo "$as_me:6522: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6211,7 +6529,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6214: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6532: 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
@@ -6220,7 +6538,7 @@ EOF
 else
  # strftime is in -lintl on SCO UNIX.
-echo "$as_me:6223: checking for strftime in -lintl" >&5
+echo "$as_me:6541: checking for strftime in -lintl" >&5
 echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
 if test "${ac_cv_lib_intl_strftime+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6228,7 +6546,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6231 "configure"
+#line 6549 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6247,16 +6565,16 @@ strftime ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6568: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6253: \$? = $ac_status" >&5
+  echo "$as_me:6571: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6574: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6259: \$? = $ac_status" >&5
+  echo "$as_me:6577: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_intl_strftime=yes
 else
@@ -6267,7 +6585,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6270: result: $ac_cv_lib_intl_strftime" >&5
+echo "$as_me:6588: result: $ac_cv_lib_intl_strftime" >&5
 echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
 if test $ac_cv_lib_intl_strftime = yes; then
  cat >>confdefs.h <<\EOF
@@ -6281,10 +6599,10 @@ fi
 done
 # Check for ALTDIRFUNC glob() extension
-echo "$as_me:6284: checking for GLOB_ALTDIRFUNC support" >&5
+echo "$as_me:6602: checking for GLOB_ALTDIRFUNC support" >&5
 echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6287 "configure"
+#line 6605 "configure"
 #include "confdefs.h"
                #include <glob.h>
@@ -6300,55 +6618,55 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 #define GLOB_HAS_ALTDIRFUNC 1
 EOF
-                echo "$as_me:6303: result: yes" >&5
+                echo "$as_me:6621: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-                echo "$as_me:6308: result: no" >&5
+                echo "$as_me:6626: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 # Check for g.gl_matchc glob() extension
-echo "$as_me:6315: checking for gl_matchc field in glob_t" >&5
+echo "$as_me:6633: checking for gl_matchc field in glob_t" >&5
 echo $ECHO_N "checking for gl_matchc field in glob_t... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 6318 "configure"
+#line 6636 "configure"
 #include "confdefs.h"
-                #include <glob.h>
+                #include <glob.h>
                int main(void){glob_t g; g.gl_matchc = 1;}
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "FOUNDIT" >/dev/null 2>&1; then
-                cat >>confdefs.h <<\EOF
+                cat >>confdefs.h <<\EOF
 #define GLOB_HAS_GL_MATCHC 1
 EOF
-                echo "$as_me:6332: result: yes" >&5
+                echo "$as_me:6650: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-                echo "$as_me:6337: result: no" >&5
+                echo "$as_me:6655: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
-echo "$as_me:6343: checking whether struct dirent allocates space for d_name" >&5
+echo "$as_me:6661: checking whether struct dirent allocates space for d_name" >&5
 echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:6346: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6664: 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 6351 "configure"
+#line 6669 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -6357,24 +6675,24 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6678: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6363: \$? = $ac_status" >&5
+  echo "$as_me:6681: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6683: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6368: \$? = $ac_status" >&5
+  echo "$as_me:6686: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:6370: result: yes" >&5
+  echo "$as_me:6688: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:6377: result: no" >&5
+                echo "$as_me:6695: result: no" >&5
 echo "${ECHO_T}no" >&6
                cat >>confdefs.h <<\EOF
 #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1
@@ -6405,15 +6723,15 @@ EOF
                        LIBS="-lskey $LIBS"
                        SKEY_MSG="yes"
-                        echo "$as_me:6408: checking for s/key support" >&5
+                        echo "$as_me:6726: checking for s/key support" >&5
 echo $ECHO_N "checking for s/key support... $ECHO_C" >&6
                        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:6411: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:6729: 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 6416 "configure"
+#line 6734 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -6422,26 +6740,26 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6743: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6428: \$? = $ac_status" >&5
+  echo "$as_me:6746: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6748: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6433: \$? = $ac_status" >&5
+  echo "$as_me:6751: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:6435: result: yes" >&5
+  echo "$as_me:6753: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                        echo "$as_me:6442: result: no" >&5
+                                        echo "$as_me:6760: result: no" >&5
 echo "${ECHO_T}no" >&6
-                                        { { echo "$as_me:6444: error: ** Incomplete or missing s/key libraries." >&5
+                                        { { echo "$as_me:6762: error: ** Incomplete or missing s/key libraries." >&5
 echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;}
   { (exit 1); exit 1; }; }
@@ -6485,10 +6803,10 @@ if test "${with_tcp_wrappers+set}" = set; then
                        fi
                        LIBWRAP="-lwrap"
                        LIBS="$LIBWRAP $LIBS"
-                        echo "$as_me:6488: checking for libwrap" >&5
+                        echo "$as_me:6806: checking for libwrap" >&5
 echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
                        cat >conftest.$ac_ext <<_ACEOF
-#line 6491 "configure"
+#line 6809 "configure"
 #include "confdefs.h"
 #include <tcpd.h>
@@ -6503,19 +6821,19 @@ hosts_access(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6824: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6509: \$? = $ac_status" >&5
+  echo "$as_me:6827: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6830: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6515: \$? = $ac_status" >&5
+  echo "$as_me:6833: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                                        echo "$as_me:6518: result: yes" >&5
+                                        echo "$as_me:6836: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                                        cat >>confdefs.h <<\EOF
 #define LIBWRAP 1
@@ -6527,7 +6845,7 @@ else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                        { { echo "$as_me:6530: error: *** libwrap missing" >&5
+                                        { { echo "$as_me:6848: error: *** libwrap missing" >&5
 echo "$as_me: error: *** libwrap missing" >&2;}
   { (exit 1); exit 1; }; }
@@ -6539,7 +6857,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi;
 for ac_func in \
-        arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
+        arc4random __b64_ntop b64_ntop __b64_pton b64_pton \
        bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
        getaddrinfo getcwd getgrouplist getnameinfo getopt \
        getpeereid _getpty getrlimit getttyent glob inet_aton \
@@ -6547,20 +6865,20 @@ for ac_func in \
        mkdtemp mmap ngetaddrinfo nsleep ogetaddrinfo openlog_r openpty \
        pstat readpassphrase realpath recvmsg rresvport_af sendmsg \
        setdtablesize setegid setenv seteuid setgroups setlogin setpcred \
-        setproctitle setregid setresgid setresuid setreuid setrlimit \
+        setproctitle setregid setreuid setrlimit \
        setsid setvbuf sigaction sigvec snprintf socketpair strerror \
-        strlcat strlcpy strmode strnvis sysconf tcgetpgrp \
+        strlcat strlcpy strmode strnvis strtoul sysconf tcgetpgrp \
-        truncate utimes vhangup vsnprintf waitpid \
+        truncate updwtmpx utimes vhangup vsnprintf waitpid \
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6557: checking for $ac_func" >&5
+echo "$as_me:6875: 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 6563 "configure"
+#line 6881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6591,16 +6909,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6912: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6597: \$? = $ac_status" >&5
+  echo "$as_me:6915: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6918: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6603: \$? = $ac_status" >&5
+  echo "$as_me:6921: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6610,7 +6928,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6613: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6931: 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
@@ -6625,13 +6943,13 @@ done
 for ac_func in gai_strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6628: checking for $ac_func" >&5
+echo "$as_me:6946: 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 6634 "configure"
+#line 6952 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -6662,16 +6980,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6983: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6668: \$? = $ac_status" >&5
+  echo "$as_me:6986: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6989: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6674: \$? = $ac_status" >&5
+  echo "$as_me:6992: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -6681,7 +6999,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6684: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7002: 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
@@ -6693,7 +7011,7 @@ EOF
 EOF
        cat >conftest.$ac_ext <<_ACEOF
-#line 6696 "configure"
+#line 7014 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -6713,16 +7031,16 @@ str = gai_strerror(0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:6719: \$? = $ac_status" >&5
+  echo "$as_me:7037: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6725: \$? = $ac_status" >&5
+  echo "$as_me:7043: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
 cat >>confdefs.h <<\EOF
@@ -6737,7 +7055,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 done
-echo "$as_me:6740: checking for library containing nanosleep" >&5
+echo "$as_me:7058: checking for library containing nanosleep" >&5
 echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6
 if test "${ac_cv_search_nanosleep+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6745,7 +7063,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_nanosleep=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 6748 "configure"
+#line 7066 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6764,16 +7082,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7085: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6770: \$? = $ac_status" >&5
+  echo "$as_me:7088: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7091: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6776: \$? = $ac_status" >&5
+  echo "$as_me:7094: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_nanosleep="none required"
 else
@@ -6785,7 +7103,7 @@ if test "$ac_cv_search_nanosleep" = no; then
  for ac_lib in rt posix4; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 6788 "configure"
+#line 7106 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6804,16 +7122,16 @@ nanosleep ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7125: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6810: \$? = $ac_status" >&5
+  echo "$as_me:7128: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7131: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6816: \$? = $ac_status" >&5
+  echo "$as_me:7134: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_nanosleep="-l$ac_lib"
 break
@@ -6826,7 +7144,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:6829: result: $ac_cv_search_nanosleep" >&5
+echo "$as_me:7147: result: $ac_cv_search_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_search_nanosleep" >&6
 if test "$ac_cv_search_nanosleep" != no; then
  test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS"
@@ -6836,13 +7154,13 @@ EOF
 fi
-echo "$as_me:6839: checking for ANSI C header files" >&5
+echo "$as_me:7157: 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 6845 "configure"
+#line 7163 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6850,13 +7168,13 @@ else
 #include <float.h>
 _ACEOF
-if { (eval echo "$as_me:6853: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7171: \"$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:6859: \$? = $ac_status" >&5
+  echo "$as_me:7177: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6878,7 +7196,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 6881 "configure"
+#line 7199 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -6896,7 +7214,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 6899 "configure"
+#line 7217 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -6917,7 +7235,7 @@ if test $ac_cv_header_stdc = yes; then
  :
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 6920 "configure"
+#line 7238 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -6943,15 +7261,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7264: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:6949: \$? = $ac_status" >&5
+  echo "$as_me:7267: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7269: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:6954: \$? = $ac_status" >&5
+  echo "$as_me:7272: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  :
 else
@@ -6964,7 +7282,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:6967: result: $ac_cv_header_stdc" >&5
+echo "$as_me:7285: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
@@ -6980,28 +7298,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6983: checking for $ac_header" >&5
+echo "$as_me:7301: 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 6989 "configure"
+#line 7307 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7313: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:6998: \$? = $ac_status" >&5
+  echo "$as_me:7316: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7319: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7004: \$? = $ac_status" >&5
+  echo "$as_me:7322: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_Header=yes"
 else
@@ -7011,7 +7329,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7014: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7332: 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
@@ -7021,13 +7339,13 @@ EOF
 fi
 done
-echo "$as_me:7024: checking whether strsep is declared" >&5
+echo "$as_me:7342: checking whether strsep is declared" >&5
 echo $ECHO_N "checking whether strsep is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_strsep+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7030 "configure"
+#line 7348 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7042,16 +7360,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7363: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7048: \$? = $ac_status" >&5
+  echo "$as_me:7366: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7369: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7054: \$? = $ac_status" >&5
+  echo "$as_me:7372: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_strsep=yes
 else
@@ -7061,20 +7379,20 @@ ac_cv_have_decl_strsep=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7064: result: $ac_cv_have_decl_strsep" >&5
+echo "$as_me:7382: result: $ac_cv_have_decl_strsep" >&5
 echo "${ECHO_T}$ac_cv_have_decl_strsep" >&6
 if test $ac_cv_have_decl_strsep = yes; then
 for ac_func in strsep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7071: checking for $ac_func" >&5
+echo "$as_me:7389: 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 7077 "configure"
+#line 7395 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7105,16 +7423,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7426: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7111: \$? = $ac_status" >&5
+  echo "$as_me:7429: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7432: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7117: \$? = $ac_status" >&5
+  echo "$as_me:7435: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7124,7 +7442,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7127: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7445: 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
@@ -7136,13 +7454,13 @@ done
 fi
-echo "$as_me:7139: checking whether getrusage is declared" >&5
+echo "$as_me:7457: checking whether getrusage is declared" >&5
 echo $ECHO_N "checking whether getrusage is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_getrusage+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7145 "configure"
+#line 7463 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -7157,16 +7475,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7478: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7163: \$? = $ac_status" >&5
+  echo "$as_me:7481: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7484: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7169: \$? = $ac_status" >&5
+  echo "$as_me:7487: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_getrusage=yes
 else
@@ -7176,20 +7494,20 @@ ac_cv_have_decl_getrusage=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7179: result: $ac_cv_have_decl_getrusage" >&5
+echo "$as_me:7497: result: $ac_cv_have_decl_getrusage" >&5
 echo "${ECHO_T}$ac_cv_have_decl_getrusage" >&6
 if test $ac_cv_have_decl_getrusage = yes; then
 for ac_func in getrusage
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7186: checking for $ac_func" >&5
+echo "$as_me:7504: 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 7192 "configure"
+#line 7510 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7220,16 +7538,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7541: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7226: \$? = $ac_status" >&5
+  echo "$as_me:7544: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7547: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7232: \$? = $ac_status" >&5
+  echo "$as_me:7550: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7239,7 +7557,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7242: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7560: 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
@@ -7251,13 +7569,13 @@ done
 fi
-echo "$as_me:7254: checking whether tcsendbreak is declared" >&5
+echo "$as_me:7572: checking whether tcsendbreak is declared" >&5
 echo $ECHO_N "checking whether tcsendbreak is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_tcsendbreak+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7260 "configure"
+#line 7578 "configure"
 #include "confdefs.h"
 #include <termios.h>
@@ -7273,16 +7591,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7594: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:7279: \$? = $ac_status" >&5
+  echo "$as_me:7597: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7600: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7285: \$? = $ac_status" >&5
+  echo "$as_me:7603: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_have_decl_tcsendbreak=yes
 else
@@ -7292,7 +7610,7 @@ ac_cv_have_decl_tcsendbreak=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7295: result: $ac_cv_have_decl_tcsendbreak" >&5
+echo "$as_me:7613: result: $ac_cv_have_decl_tcsendbreak" >&5
 echo "${ECHO_T}$ac_cv_have_decl_tcsendbreak" >&6
 if test $ac_cv_have_decl_tcsendbreak = yes; then
  cat >>confdefs.h <<\EOF
@@ -7304,13 +7622,84 @@ else
 for ac_func in tcsendbreak
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7307: checking for $ac_func" >&5
+echo "$as_me:7625: 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 7631 "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:7662: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7665: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7668: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7671: \$? = $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:7681: 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
+for ac_func in setresuid
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7696: 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 7313 "configure"
+#line 7702 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7341,16 +7730,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7733: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7347: \$? = $ac_status" >&5
+  echo "$as_me:7736: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7739: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7353: \$? = $ac_status" >&5
+  echo "$as_me:7742: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7360,28 +7749,183 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7363: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7752: 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
+                echo "$as_me:7759: checking if setresuid seems to work" >&5
+echo $ECHO_N "checking if setresuid seems to work... $ECHO_C" >&6
+        if test "$cross_compiling" = yes; then
+  { { echo "$as_me:7762: 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 7767 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <errno.h>
+int main(){errno=0; setresuid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:7776: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7779: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7784: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:7786: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cat >>confdefs.h <<\EOF
+#define BROKEN_SETRESUID 1
+EOF
+                 echo "$as_me:7796: result: not implemented" >&5
+echo "${ECHO_T}not implemented" >&6
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
 fi
 done
+for ac_func in setresgid
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:7809: 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 7815 "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:7846: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7849: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7855: \$? = $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:7865: 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
+                echo "$as_me:7872: checking if setresgid seems to work" >&5
+echo $ECHO_N "checking if setresgid seems to work... $ECHO_C" >&6
+        if test "$cross_compiling" = yes; then
+  { { echo "$as_me:7875: 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 7880 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <errno.h>
+int main(){errno=0; setresgid(0,0,0); if (errno==ENOSYS) exit(1); else exit(0);}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:7889: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7892: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:7894: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7897: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:7899: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cat >>confdefs.h <<\EOF
+#define BROKEN_SETRESGID 1
+EOF
+                 echo "$as_me:7909: result: not implemented" >&5
+echo "${ECHO_T}not implemented" >&6
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+fi
+done
 for ac_func in gettimeofday time
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7378: checking for $ac_func" >&5
+echo "$as_me:7922: 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 7384 "configure"
+#line 7928 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7412,16 +7956,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7959: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7418: \$? = $ac_status" >&5
+  echo "$as_me:7962: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7965: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7424: \$? = $ac_status" >&5
+  echo "$as_me:7968: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7431,7 +7975,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7434: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7978: 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
@@ -7444,13 +7988,13 @@ done
 for ac_func in endutent getutent getutid getutline pututline setutent
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7447: checking for $ac_func" >&5
+echo "$as_me:7991: 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 7453 "configure"
+#line 7997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7481,16 +8025,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8028: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7487: \$? = $ac_status" >&5
+  echo "$as_me:8031: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8034: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7493: \$? = $ac_status" >&5
+  echo "$as_me:8037: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7500,7 +8044,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7503: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8047: 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
@@ -7513,13 +8057,13 @@ done
 for ac_func in utmpname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7516: checking for $ac_func" >&5
+echo "$as_me:8060: 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 7522 "configure"
+#line 8066 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7550,16 +8094,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8097: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7556: \$? = $ac_status" >&5
+  echo "$as_me:8100: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8103: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7562: \$? = $ac_status" >&5
+  echo "$as_me:8106: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7569,7 +8113,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7572: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8116: 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
@@ -7582,13 +8126,13 @@ done
 for ac_func in endutxent getutxent getutxid getutxline pututxline
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7585: checking for $ac_func" >&5
+echo "$as_me:8129: 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 7591 "configure"
+#line 8135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7619,16 +8163,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8166: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7625: \$? = $ac_status" >&5
+  echo "$as_me:8169: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7631: \$? = $ac_status" >&5
+  echo "$as_me:8175: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7638,7 +8182,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7641: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8185: 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
@@ -7651,13 +8195,13 @@ done
 for ac_func in setutxent utmpxname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7654: checking for $ac_func" >&5
+echo "$as_me:8198: 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 7660 "configure"
+#line 8204 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -7688,16 +8232,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8235: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7694: \$? = $ac_status" >&5
+  echo "$as_me:8238: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7700: \$? = $ac_status" >&5
+  echo "$as_me:8244: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -7707,7 +8251,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7710: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8254: 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
@@ -7717,13 +8261,13 @@ EOF
 fi
 done
-echo "$as_me:7720: checking for daemon" >&5
+echo "$as_me:8264: checking for daemon" >&5
 echo $ECHO_N "checking for daemon... $ECHO_C" >&6
 if test "${ac_cv_func_daemon+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7726 "configure"
+#line 8270 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char daemon (); below.  */
@@ -7754,16 +8298,16 @@ f = daemon;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7757: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8301: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7760: \$? = $ac_status" >&5
+  echo "$as_me:8304: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8307: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7766: \$? = $ac_status" >&5
+  echo "$as_me:8310: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_daemon=yes
 else
@@ -7773,7 +8317,7 @@ ac_cv_func_daemon=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7776: result: $ac_cv_func_daemon" >&5
+echo "$as_me:8320: result: $ac_cv_func_daemon" >&5
 echo "${ECHO_T}$ac_cv_func_daemon" >&6
 if test $ac_cv_func_daemon = yes; then
  cat >>confdefs.h <<\EOF
@@ -7781,7 +8325,7 @@ if test $ac_cv_func_daemon = yes; then
 EOF
 else
-  echo "$as_me:7784: checking for daemon in -lbsd" >&5
+  echo "$as_me:8328: checking for daemon in -lbsd" >&5
 echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_daemon+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7789,7 +8333,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7792 "configure"
+#line 8336 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7808,16 +8352,16 @@ daemon ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8355: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7814: \$? = $ac_status" >&5
+  echo "$as_me:8358: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8361: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7820: \$? = $ac_status" >&5
+  echo "$as_me:8364: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_bsd_daemon=yes
 else
@@ -7828,7 +8372,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7831: result: $ac_cv_lib_bsd_daemon" >&5
+echo "$as_me:8375: result: $ac_cv_lib_bsd_daemon" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_daemon" >&6
 if test $ac_cv_lib_bsd_daemon = yes; then
  LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\EOF
@@ -7839,13 +8383,13 @@ fi
 fi
-echo "$as_me:7842: checking for getpagesize" >&5
+echo "$as_me:8386: checking for getpagesize" >&5
 echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6
 if test "${ac_cv_func_getpagesize+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 7848 "configure"
+#line 8392 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char getpagesize (); below.  */
@@ -7876,16 +8420,16 @@ f = getpagesize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8423: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7882: \$? = $ac_status" >&5
+  echo "$as_me:8426: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8429: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7888: \$? = $ac_status" >&5
+  echo "$as_me:8432: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getpagesize=yes
 else
@@ -7895,7 +8439,7 @@ ac_cv_func_getpagesize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7898: result: $ac_cv_func_getpagesize" >&5
+echo "$as_me:8442: result: $ac_cv_func_getpagesize" >&5
 echo "${ECHO_T}$ac_cv_func_getpagesize" >&6
 if test $ac_cv_func_getpagesize = yes; then
  cat >>confdefs.h <<\EOF
@@ -7903,7 +8447,7 @@ if test $ac_cv_func_getpagesize = yes; then
 EOF
 else
-  echo "$as_me:7906: checking for getpagesize in -lucb" >&5
+  echo "$as_me:8450: checking for getpagesize in -lucb" >&5
 echo $ECHO_N "checking for getpagesize in -lucb... $ECHO_C" >&6
 if test "${ac_cv_lib_ucb_getpagesize+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7911,7 +8455,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7914 "configure"
+#line 8458 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7930,16 +8474,16 @@ getpagesize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8477: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7936: \$? = $ac_status" >&5
+  echo "$as_me:8480: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8483: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7942: \$? = $ac_status" >&5
+  echo "$as_me:8486: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_ucb_getpagesize=yes
 else
@@ -7950,7 +8494,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7953: result: $ac_cv_lib_ucb_getpagesize" >&5
+echo "$as_me:8497: result: $ac_cv_lib_ucb_getpagesize" >&5
 echo "${ECHO_T}$ac_cv_lib_ucb_getpagesize" >&6
 if test $ac_cv_lib_ucb_getpagesize = yes; then
  LIBS="$LIBS -lucb"; cat >>confdefs.h <<\EOF
@@ -7963,15 +8507,15 @@ fi
 # Check for broken snprintf
 if test "x$ac_cv_func_snprintf" = "xyes" ; then
-        echo "$as_me:7966: checking whether snprintf correctly terminates long strings" >&5
+        echo "$as_me:8510: checking whether snprintf correctly terminates long strings" >&5
 echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:7969: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8513: 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 7974 "configure"
+#line 8518 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -7979,30 +8523,30 @@ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8526: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:7985: \$? = $ac_status" >&5
+  echo "$as_me:8529: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8531: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:7990: \$? = $ac_status" >&5
+  echo "$as_me:8534: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:7992: result: yes" >&5
+  echo "$as_me:8536: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                        echo "$as_me:7999: result: no" >&5
+                        echo "$as_me:8543: result: no" >&5
 echo "${ECHO_T}no" >&6
                        cat >>confdefs.h <<\EOF
 #define BROKEN_SNPRINTF 1
 EOF
-                        { echo "$as_me:8005: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
+                        { echo "$as_me:8549: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5
 echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;}
 fi
@@ -8011,11 +8555,11 @@ fi
 fi
 if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
-echo "$as_me:8014: checking for (overly) strict mkstemp" >&5
+echo "$as_me:8558: checking for (overly) strict mkstemp" >&5
 echo $ECHO_N "checking for (overly) strict mkstemp... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-                echo "$as_me:8018: result: yes" >&5
+                echo "$as_me:8562: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8023,7 +8567,7 @@ EOF
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 8026 "configure"
+#line 8570 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -8035,18 +8579,18 @@ unlink(template); exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8582: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8041: \$? = $ac_status" >&5
+  echo "$as_me:8585: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8587: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8046: \$? = $ac_status" >&5
+  echo "$as_me:8590: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                echo "$as_me:8049: result: no" >&5
+                echo "$as_me:8593: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
@@ -8054,7 +8598,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:8057: result: yes" >&5
+                echo "$as_me:8601: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAVE_STRICT_MKSTEMP 1
@@ -8066,15 +8610,15 @@ fi
 fi
 if test ! -z "$check_for_openpty_ctty_bug"; then
-        echo "$as_me:8069: checking if openpty correctly handles controlling tty" >&5
+        echo "$as_me:8613: checking if openpty correctly handles controlling tty" >&5
 echo $ECHO_N "checking if openpty correctly handles controlling tty... $ECHO_C" >&6
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8072: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8616: 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 8077 "configure"
+#line 8621 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -8111,18 +8655,18 @@ main()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8658: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8117: \$? = $ac_status" >&5
+  echo "$as_me:8661: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8663: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8122: \$? = $ac_status" >&5
+  echo "$as_me:8666: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                        echo "$as_me:8125: result: yes" >&5
+                        echo "$as_me:8669: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -8130,7 +8674,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                        echo "$as_me:8133: result: no" >&5
+                        echo "$as_me:8677: result: no" >&5
 echo "${ECHO_T}no" >&6
                        cat >>confdefs.h <<\EOF
 #define SSHD_ACQUIRES_CTTY 1
@@ -8141,14 +8685,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:8144: checking whether getpgrp takes no argument" >&5
+echo "$as_me:8688: checking whether getpgrp takes no argument" >&5
 echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6
 if test "${ac_cv_func_getpgrp_void+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  # Use it with a single arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8151 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8160,16 +8704,16 @@ getpgrp (0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8707: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:8166: \$? = $ac_status" >&5
+  echo "$as_me:8710: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8713: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8172: \$? = $ac_status" >&5
+  echo "$as_me:8716: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_func_getpgrp_1=yes
 else
@@ -8180,7 +8724,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 # Use it with no arg.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8183 "configure"
+#line 8727 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8192,16 +8736,16 @@ getpgrp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8739: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:8198: \$? = $ac_status" >&5
+  echo "$as_me:8742: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8745: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8204: \$? = $ac_status" >&5
+  echo "$as_me:8748: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_func_getpgrp_0=yes
 else
@@ -8215,12 +8759,12 @@ case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in
  yes:no) ac_cv_func_getpgrp_void=yes;;
  no:yes) ac_cv_func_getpgrp_void=false;;
  *) if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8218: error: cannot check getpgrp if cross compiling" >&5
+  { { echo "$as_me:8762: error: cannot check getpgrp if cross compiling" >&5
 echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;}
   { (exit 1); exit 1; }; }
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 8223 "configure"
+#line 8767 "configure"
 #include "confdefs.h"
 $ac_includes_default
@@ -8274,15 +8818,15 @@ main ()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8821: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8280: \$? = $ac_status" >&5
+  echo "$as_me:8824: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8826: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8285: \$? = $ac_status" >&5
+  echo "$as_me:8829: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_func_getpgrp_void=yes
 else
@@ -8296,7 +8840,7 @@ fi;;
 esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
 fi
-echo "$as_me:8299: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:8843: result: $ac_cv_func_getpgrp_void" >&5
 echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6
 if test $ac_cv_func_getpgrp_void = yes; then
@@ -8314,13 +8858,14 @@ if test "${with_pam+set}" = set; then
  withval="$with_pam"
                if test "x$withval" != "xno" ; then
-                        if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then
+                        if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \
-                                { { echo "$as_me:8318: error: PAM headers not found" >&5
+                           test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then
+                                { { echo "$as_me:8863: error: PAM headers not found" >&5
 echo "$as_me: error: PAM headers not found" >&2;}
   { (exit 1); exit 1; }; }
                        fi
-echo "$as_me:8323: checking for dlopen in -ldl" >&5
+echo "$as_me:8868: 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
@@ -8328,7 +8873,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8331 "configure"
+#line 8876 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8347,16 +8892,16 @@ dlopen ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8895: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8353: \$? = $ac_status" >&5
+  echo "$as_me:8898: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8901: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8359: \$? = $ac_status" >&5
+  echo "$as_me:8904: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_dl_dlopen=yes
 else
@@ -8367,7 +8912,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8370: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:8915: 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
  cat >>confdefs.h <<EOF
@@ -8378,7 +8923,7 @@ EOF
 fi
-echo "$as_me:8381: checking for pam_set_item in -lpam" >&5
+echo "$as_me:8926: checking for pam_set_item in -lpam" >&5
 echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6
 if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8386,7 +8931,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8389 "configure"
+#line 8934 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8405,16 +8950,16 @@ pam_set_item ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8953: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8411: \$? = $ac_status" >&5
+  echo "$as_me:8956: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8417: \$? = $ac_status" >&5
+  echo "$as_me:8962: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_pam_pam_set_item=yes
 else
@@ -8425,7 +8970,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:8428: result: $ac_cv_lib_pam_pam_set_item" >&5
+echo "$as_me:8973: result: $ac_cv_lib_pam_pam_set_item" >&5
 echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6
 if test $ac_cv_lib_pam_pam_set_item = yes; then
  cat >>confdefs.h <<EOF
@@ -8435,7 +8980,7 @@ EOF
  LIBS="-lpam $LIBS"
 else
-  { { echo "$as_me:8438: error: *** libpam missing" >&5
+  { { echo "$as_me:8983: error: *** libpam missing" >&5
 echo "$as_me: error: *** libpam missing" >&2;}
   { (exit 1); exit 1; }; }
 fi
@@ -8443,13 +8988,13 @@ fi
 for ac_func in pam_getenvlist
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8446: checking for $ac_func" >&5
+echo "$as_me:8991: 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 8452 "configure"
+#line 8997 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8480,16 +9025,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9028: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8486: \$? = $ac_status" >&5
+  echo "$as_me:9031: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9034: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8492: \$? = $ac_status" >&5
+  echo "$as_me:9037: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8499,7 +9044,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8502: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9047: 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
@@ -8512,13 +9057,13 @@ done
 for ac_func in pam_putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8515: checking for $ac_func" >&5
+echo "$as_me:9060: 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 8521 "configure"
+#line 9066 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -8549,16 +9094,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9097: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8555: \$? = $ac_status" >&5
+  echo "$as_me:9100: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9103: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8561: \$? = $ac_status" >&5
+  echo "$as_me:9106: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -8568,7 +9113,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8571: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:9116: 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
@@ -8578,7 +9123,6 @@ EOF
 fi
 done
-                        disable_shadow=yes
                        PAM_MSG="yes"
                        cat >>confdefs.h <<\EOF
@@ -8598,14 +9142,18 @@ fi;
 # Check for older PAM
 if test "x$PAM_MSG" = "xyes" ; then
        # Check PAM strerror arguments (old PAM)
-        echo "$as_me:8601: checking whether pam_strerror takes only one argument" >&5
+        echo "$as_me:9145: checking whether pam_strerror takes only one argument" >&5
 echo $ECHO_N "checking whether pam_strerror takes only one argument... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 8604 "configure"
+#line 9148 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
+#if defined(HAVE_SECURITY_PAM_APPL_H)
 #include <security/pam_appl.h>
+#elif defined (HAVE_PAM_PAM_APPL_H)
+#include <pam/pam_appl.h>
+#endif
 int
 main ()
@@ -8616,18 +9164,18 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9167: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:8622: \$? = $ac_status" >&5
+  echo "$as_me:9170: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9173: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8628: \$? = $ac_status" >&5
+  echo "$as_me:9176: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-  echo "$as_me:8630: result: no" >&5
+  echo "$as_me:9178: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
  echo "$as_me: failed program was:" >&5
@@ -8637,7 +9185,7 @@ cat conftest.$ac_ext >&5
 #define HAVE_OLD_PAM 1
 EOF
-                        echo "$as_me:8640: result: yes" >&5
+                        echo "$as_me:9188: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        PAM_MSG="yes (old library)"
@@ -8645,70 +9193,6 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
-# because the system crypt() is more featureful.
-if test "x$check_for_libcrypt_before" = "x1"; then
-echo "$as_me:8652: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 8660 "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 crypt ();
-int
-main ()
-{
-crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8679: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:8682: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8685: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:8688: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypt_crypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_crypt_crypt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:8699: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-if test $ac_cv_lib_crypt_crypt = yes; then
-  cat >>confdefs.h <<EOF
-#define HAVE_LIBCRYPT 1
-EOF
-  LIBS="-lcrypt $LIBS"
-fi
-fi
 # Search for OpenSSL
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LDFLAGS="$LDFLAGS"
@@ -8739,9 +9223,9 @@ if test "${with_ssl_dir+set}" = set; then
                fi
 fi;
-LIBS="$LIBS -lcrypto"
+LIBS="-lcrypto $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 8744 "configure"
+#line 9228 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8760,16 +9244,16 @@ RAND_add ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9247: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8766: \$? = $ac_status" >&5
+  echo "$as_me:9250: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8772: \$? = $ac_status" >&5
+  echo "$as_me:9256: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -8786,7 +9270,7 @@ cat conftest.$ac_ext >&5
                fi
                CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
                cat >conftest.$ac_ext <<_ACEOF
-#line 8789 "configure"
+#line 9273 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -8805,16 +9289,16 @@ RAND_add ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9292: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8811: \$? = $ac_status" >&5
+  echo "$as_me:9295: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9298: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8817: \$? = $ac_status" >&5
+  echo "$as_me:9301: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cat >>confdefs.h <<\EOF
 #define HAVE_OPENSSL 1
@@ -8824,7 +9308,7 @@ else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                                { { echo "$as_me:8827: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5
+                                { { echo "$as_me:9311: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5
 echo "$as_me: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&2;}
   { (exit 1); exit 1; }; }
@@ -8835,15 +9319,15 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 # Determine OpenSSL header version
-echo "$as_me:8838: checking OpenSSL header version" >&5
+echo "$as_me:9322: checking OpenSSL header version" >&5
 echo $ECHO_N "checking OpenSSL header version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8841: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9325: 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 8846 "configure"
+#line 9330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -8851,12 +9335,12 @@ else
 #include <openssl/opensslv.h>
 #define DATA "conftest.sslincver"
 int main(void) {
-        FILE *fd;
+        FILE *fd;
-        int rc;
+        int rc;
-        fd = fopen(DATA,"w");
+        fd = fopen(DATA,"w");
-        if(fd == NULL)
+        if(fd == NULL)
-                exit(1);
+                exit(1);
        if ((rc = fprintf(fd ,"%x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
                exit(1);
@@ -8866,19 +9350,19 @@ int main(void) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9353: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8872: \$? = $ac_status" >&5
+  echo "$as_me:9356: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9358: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8877: \$? = $ac_status" >&5
+  echo "$as_me:9361: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                ssl_header_ver=`cat conftest.sslincver`
-                echo "$as_me:8881: result: $ssl_header_ver" >&5
+                echo "$as_me:9365: result: $ssl_header_ver" >&5
 echo "${ECHO_T}$ssl_header_ver" >&6
 else
@@ -8886,9 +9370,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:8889: result: not found" >&5
+                echo "$as_me:9373: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:8891: error: OpenSSL version header not found." >&5
+                { { echo "$as_me:9375: error: OpenSSL version header not found." >&5
 echo "$as_me: error: OpenSSL version header not found." >&2;}
   { (exit 1); exit 1; }; }
@@ -8897,15 +9381,15 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 # Determine OpenSSL library version
-echo "$as_me:8900: checking OpenSSL library version" >&5
+echo "$as_me:9384: checking OpenSSL library version" >&5
 echo $ECHO_N "checking OpenSSL library version... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8903: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9387: 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 8908 "configure"
+#line 9392 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -8914,12 +9398,12 @@ else
 #include <openssl/crypto.h>
 #define DATA "conftest.ssllibver"
 int main(void) {
-        FILE *fd;
+        FILE *fd;
-        int rc;
+        int rc;
-        fd = fopen(DATA,"w");
+        fd = fopen(DATA,"w");
-        if(fd == NULL)
+        if(fd == NULL)
-                exit(1);
+                exit(1);
        if ((rc = fprintf(fd ,"%x (%s)\n", SSLeay(), SSLeay_version(SSLEAY_VERSION))) <0)
                exit(1);
@@ -8929,19 +9413,19 @@ int main(void) {
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9416: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8935: \$? = $ac_status" >&5
+  echo "$as_me:9419: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9421: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8940: \$? = $ac_status" >&5
+  echo "$as_me:9424: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                ssl_library_ver=`cat conftest.ssllibver`
-                echo "$as_me:8944: result: $ssl_library_ver" >&5
+                echo "$as_me:9428: result: $ssl_library_ver" >&5
 echo "${ECHO_T}$ssl_library_ver" >&6
 else
@@ -8949,9 +9433,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:8952: result: not found" >&5
+                echo "$as_me:9436: result: not found" >&5
 echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:8954: error: OpenSSL library not found." >&5
+                { { echo "$as_me:9438: error: OpenSSL library not found." >&5
 echo "$as_me: error: OpenSSL library not found." >&2;}
   { (exit 1); exit 1; }; }
@@ -8960,15 +9444,15 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 # Sanity check OpenSSL headers
-echo "$as_me:8963: checking whether OpenSSL's headers match the library" >&5
+echo "$as_me:9447: checking whether OpenSSL's headers match the library" >&5
 echo $ECHO_N "checking whether OpenSSL's headers match the library... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8966: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9450: 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 8971 "configure"
+#line 9455 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -8977,18 +9461,18 @@ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9464: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:8983: \$? = $ac_status" >&5
+  echo "$as_me:9467: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9469: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:8988: \$? = $ac_status" >&5
+  echo "$as_me:9472: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-                echo "$as_me:8991: result: yes" >&5
+                echo "$as_me:9475: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -8996,9 +9480,9 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:8999: result: no" >&5
+                echo "$as_me:9483: result: no" >&5
 echo "${ECHO_T}no" >&6
-                { { echo "$as_me:9001: error: Your OpenSSL headers do not match your library.
+                { { echo "$as_me:9485: error: Your OpenSSL headers do not match your library.
 Check config.log for details.
 Also see contrib/findssl.sh for help identifying header/library mismatches." >&5
 echo "$as_me: error: Your OpenSSL headers do not match your library.
@@ -9010,10 +9494,74 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
+# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
+# because the system crypt() is more featureful.
+if test "x$check_for_libcrypt_before" = "x1"; then
+echo "$as_me:9501: checking for crypt in -lcrypt" >&5
+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 9509 "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 crypt ();
+int
+main ()
+{
+crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9528: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9531: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9537: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_crypt_crypt=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_crypt_crypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:9548: result: $ac_cv_lib_crypt_crypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
+if test $ac_cv_lib_crypt_crypt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBCRYPT 1
+EOF
+  LIBS="-lcrypt $LIBS"
+fi
+fi
 # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
-# version in OpenSSL. Skip this for PAM
+# version in OpenSSL.
 if test "x$check_for_libcrypt_later" = "x1"; then
-        echo "$as_me:9016: checking for crypt in -lcrypt" >&5
+        echo "$as_me:9564: checking for crypt in -lcrypt" >&5
 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9021,7 +9569,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 9024 "configure"
+#line 9572 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -9040,16 +9588,16 @@ crypt ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9591: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9046: \$? = $ac_status" >&5
+  echo "$as_me:9594: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9597: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9052: \$? = $ac_status" >&5
+  echo "$as_me:9600: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_crypt_crypt=yes
 else
@@ -9060,7 +9608,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:9063: result: $ac_cv_lib_crypt_crypt" >&5
+echo "$as_me:9611: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
  LIBS="$LIBS -lcrypt"
@@ -9071,15 +9619,15 @@ fi
 ### Configure cryptographic random number support
 # Check wheter OpenSSL seeds itself
-echo "$as_me:9074: checking whether OpenSSL's PRNG is internally seeded" >&5
+echo "$as_me:9622: checking whether OpenSSL's PRNG is internally seeded" >&5
 echo $ECHO_N "checking whether OpenSSL's PRNG is internally seeded... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9077: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9625: 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 9082 "configure"
+#line 9630 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -9088,19 +9636,19 @@ int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9639: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:9094: \$? = $ac_status" >&5
+  echo "$as_me:9642: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9644: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:9099: \$? = $ac_status" >&5
+  echo "$as_me:9647: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                OPENSSL_SEEDS_ITSELF=yes
-                echo "$as_me:9103: result: yes" >&5
+                echo "$as_me:9651: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
@@ -9108,7 +9656,7 @@ else
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:9111: result: no" >&5
+                echo "$as_me:9659: result: no" >&5
 echo "${ECHO_T}no" >&6
                # Default to use of the rand helper if OpenSSL doesn't
                # seed itself
@@ -9128,7 +9676,7 @@ if test "${with_rand_helper+set}" = set; then
                        # Force use of OpenSSL's internal RNG, even if
                        # the previous test showed it to be unseeded.
                        if test -z "$OPENSSL_SEEDS_ITSELF" ; then
-                                { echo "$as_me:9131: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5
+                                { echo "$as_me:9679: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5
 echo "$as_me: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&2;}
                                OPENSSL_SEEDS_ITSELF=yes
                                USE_RAND_HELPER=""
@@ -9169,7 +9717,7 @@ if test "${with_prngd_port+set}" = set; then
                [0-9]*)
                        ;;
                *)
-                        { { echo "$as_me:9172: error: You must specify a numeric port number for --with-prngd-port" >&5
+                        { { echo "$as_me:9720: error: You must specify a numeric port number for --with-prngd-port" >&5
 echo "$as_me: error: You must specify a numeric port number for --with-prngd-port" >&2;}
   { (exit 1); exit 1; }; }
                        ;;
@@ -9200,7 +9748,7 @@ if test "${with_prngd_socket+set}" = set; then
                /*)
                        ;;
                *)
-                        { { echo "$as_me:9203: error: You must specify an absolute path to the entropy socket" >&5
+                        { { echo "$as_me:9751: error: You must specify an absolute path to the entropy socket" >&5
 echo "$as_me: error: You must specify an absolute path to the entropy socket" >&2;}
   { (exit 1); exit 1; }; }
                        ;;
@@ -9208,12 +9756,12 @@ echo "$as_me: error: You must specify an absolute path to the entropy socket" >&
                if test ! -z "$withval" ; then
                        if test ! -z "$PRNGD_PORT" ; then
-                                { { echo "$as_me:9211: error: You may not specify both a PRNGD/EGD port and socket" >&5
+                                { { echo "$as_me:9759: error: You may not specify both a PRNGD/EGD port and socket" >&5
 echo "$as_me: error: You may not specify both a PRNGD/EGD port and socket" >&2;}
   { (exit 1); exit 1; }; }
                        fi
                        if test ! -r "$withval" ; then
-                                { echo "$as_me:9216: WARNING: Entropy socket is not readable" >&5
+                                { echo "$as_me:9764: WARNING: Entropy socket is not readable" >&5
 echo "$as_me: WARNING: Entropy socket is not readable" >&2;}
                        fi
                        PRNGD_SOCKET="$withval"
@@ -9227,7 +9775,7 @@ else
                # Check for existing socket only if we don't have a random device already
                if test "$USE_RAND_HELPER" = yes ; then
-                        echo "$as_me:9230: checking for PRNGD/EGD socket" >&5
+                        echo "$as_me:9778: checking for PRNGD/EGD socket" >&5
 echo $ECHO_N "checking for PRNGD/EGD socket... $ECHO_C" >&6
                        # Insert other locations here
                        for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
@@ -9241,10 +9789,10 @@ EOF
                                fi
                        done
                        if test ! -z "$PRNGD_SOCKET" ; then
-                                echo "$as_me:9244: result: $PRNGD_SOCKET" >&5
+                                echo "$as_me:9792: result: $PRNGD_SOCKET" >&5
 echo "${ECHO_T}$PRNGD_SOCKET" >&6
                        else
-                                echo "$as_me:9247: result: not found" >&5
+                                echo "$as_me:9795: result: not found" >&5
 echo "${ECHO_T}not found" >&6
                        fi
                fi
@@ -9300,7 +9848,7 @@ PATH=$PATH:/etc:$OPATH
        # Extract the first word of "ls", so it can be a program name with args.
 set dummy ls; ac_word=$2
-echo "$as_me:9303: checking for $ac_word" >&5
+echo "$as_me:9851: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LS+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9317,7 +9865,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_LS="$ac_dir/$ac_word"
-   echo "$as_me:9320: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9868: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9328,10 +9876,10 @@ fi
 PROG_LS=$ac_cv_path_PROG_LS
 if test -n "$PROG_LS"; then
-  echo "$as_me:9331: result: $PROG_LS" >&5
+  echo "$as_me:9879: result: $PROG_LS" >&5
 echo "${ECHO_T}$PROG_LS" >&6
 else
-  echo "$as_me:9334: result: no" >&5
+  echo "$as_me:9882: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9341,7 +9889,7 @@ fi
        # Extract the first word of "netstat", so it can be a program name with args.
 set dummy netstat; ac_word=$2
-echo "$as_me:9344: checking for $ac_word" >&5
+echo "$as_me:9892: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_NETSTAT+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9358,7 +9906,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_NETSTAT="$ac_dir/$ac_word"
-   echo "$as_me:9361: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9909: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9369,10 +9917,10 @@ fi
 PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT
 if test -n "$PROG_NETSTAT"; then
-  echo "$as_me:9372: result: $PROG_NETSTAT" >&5
+  echo "$as_me:9920: result: $PROG_NETSTAT" >&5
 echo "${ECHO_T}$PROG_NETSTAT" >&6
 else
-  echo "$as_me:9375: result: no" >&5
+  echo "$as_me:9923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9382,7 +9930,7 @@ fi
        # Extract the first word of "arp", so it can be a program name with args.
 set dummy arp; ac_word=$2
-echo "$as_me:9385: checking for $ac_word" >&5
+echo "$as_me:9933: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_ARP+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9399,7 +9947,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_ARP="$ac_dir/$ac_word"
-   echo "$as_me:9402: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9950: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9410,10 +9958,10 @@ fi
 PROG_ARP=$ac_cv_path_PROG_ARP
 if test -n "$PROG_ARP"; then
-  echo "$as_me:9413: result: $PROG_ARP" >&5
+  echo "$as_me:9961: result: $PROG_ARP" >&5
 echo "${ECHO_T}$PROG_ARP" >&6
 else
-  echo "$as_me:9416: result: no" >&5
+  echo "$as_me:9964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9423,7 +9971,7 @@ fi
        # Extract the first word of "ifconfig", so it can be a program name with args.
 set dummy ifconfig; ac_word=$2
-echo "$as_me:9426: checking for $ac_word" >&5
+echo "$as_me:9974: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_IFCONFIG+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9440,7 +9988,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_IFCONFIG="$ac_dir/$ac_word"
-   echo "$as_me:9443: found $ac_dir/$ac_word" >&5
+   echo "$as_me:9991: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9451,10 +9999,10 @@ fi
 PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG
 if test -n "$PROG_IFCONFIG"; then
-  echo "$as_me:9454: result: $PROG_IFCONFIG" >&5
+  echo "$as_me:10002: result: $PROG_IFCONFIG" >&5
 echo "${ECHO_T}$PROG_IFCONFIG" >&6
 else
-  echo "$as_me:9457: result: no" >&5
+  echo "$as_me:10005: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9464,7 +10012,7 @@ fi
        # Extract the first word of "jstat", so it can be a program name with args.
 set dummy jstat; ac_word=$2
-echo "$as_me:9467: checking for $ac_word" >&5
+echo "$as_me:10015: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_JSTAT+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9481,7 +10029,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_JSTAT="$ac_dir/$ac_word"
-   echo "$as_me:9484: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10032: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9492,10 +10040,10 @@ fi
 PROG_JSTAT=$ac_cv_path_PROG_JSTAT
 if test -n "$PROG_JSTAT"; then
-  echo "$as_me:9495: result: $PROG_JSTAT" >&5
+  echo "$as_me:10043: result: $PROG_JSTAT" >&5
 echo "${ECHO_T}$PROG_JSTAT" >&6
 else
-  echo "$as_me:9498: result: no" >&5
+  echo "$as_me:10046: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9505,7 +10053,7 @@ fi
        # Extract the first word of "ps", so it can be a program name with args.
 set dummy ps; ac_word=$2
-echo "$as_me:9508: checking for $ac_word" >&5
+echo "$as_me:10056: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_PS+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9522,7 +10070,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_PS="$ac_dir/$ac_word"
-   echo "$as_me:9525: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10073: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9533,10 +10081,10 @@ fi
 PROG_PS=$ac_cv_path_PROG_PS
 if test -n "$PROG_PS"; then
-  echo "$as_me:9536: result: $PROG_PS" >&5
+  echo "$as_me:10084: result: $PROG_PS" >&5
 echo "${ECHO_T}$PROG_PS" >&6
 else
-  echo "$as_me:9539: result: no" >&5
+  echo "$as_me:10087: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9546,7 +10094,7 @@ fi
        # Extract the first word of "sar", so it can be a program name with args.
 set dummy sar; ac_word=$2
-echo "$as_me:9549: checking for $ac_word" >&5
+echo "$as_me:10097: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_SAR+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9563,7 +10111,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_SAR="$ac_dir/$ac_word"
-   echo "$as_me:9566: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10114: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9574,10 +10122,10 @@ fi
 PROG_SAR=$ac_cv_path_PROG_SAR
 if test -n "$PROG_SAR"; then
-  echo "$as_me:9577: result: $PROG_SAR" >&5
+  echo "$as_me:10125: result: $PROG_SAR" >&5
 echo "${ECHO_T}$PROG_SAR" >&6
 else
-  echo "$as_me:9580: result: no" >&5
+  echo "$as_me:10128: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9587,7 +10135,7 @@ fi
        # Extract the first word of "w", so it can be a program name with args.
 set dummy w; ac_word=$2
-echo "$as_me:9590: checking for $ac_word" >&5
+echo "$as_me:10138: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_W+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9604,7 +10152,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_W="$ac_dir/$ac_word"
-   echo "$as_me:9607: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10155: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9615,10 +10163,10 @@ fi
 PROG_W=$ac_cv_path_PROG_W
 if test -n "$PROG_W"; then
-  echo "$as_me:9618: result: $PROG_W" >&5
+  echo "$as_me:10166: result: $PROG_W" >&5
 echo "${ECHO_T}$PROG_W" >&6
 else
-  echo "$as_me:9621: result: no" >&5
+  echo "$as_me:10169: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9628,7 +10176,7 @@ fi
        # Extract the first word of "who", so it can be a program name with args.
 set dummy who; ac_word=$2
-echo "$as_me:9631: checking for $ac_word" >&5
+echo "$as_me:10179: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_WHO+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9645,7 +10193,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_WHO="$ac_dir/$ac_word"
-   echo "$as_me:9648: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10196: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9656,10 +10204,10 @@ fi
 PROG_WHO=$ac_cv_path_PROG_WHO
 if test -n "$PROG_WHO"; then
-  echo "$as_me:9659: result: $PROG_WHO" >&5
+  echo "$as_me:10207: result: $PROG_WHO" >&5
 echo "${ECHO_T}$PROG_WHO" >&6
 else
-  echo "$as_me:9662: result: no" >&5
+  echo "$as_me:10210: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9669,7 +10217,7 @@ fi
        # Extract the first word of "last", so it can be a program name with args.
 set dummy last; ac_word=$2
-echo "$as_me:9672: checking for $ac_word" >&5
+echo "$as_me:10220: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LAST+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9686,7 +10234,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_LAST="$ac_dir/$ac_word"
-   echo "$as_me:9689: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10237: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9697,10 +10245,10 @@ fi
 PROG_LAST=$ac_cv_path_PROG_LAST
 if test -n "$PROG_LAST"; then
-  echo "$as_me:9700: result: $PROG_LAST" >&5
+  echo "$as_me:10248: result: $PROG_LAST" >&5
 echo "${ECHO_T}$PROG_LAST" >&6
 else
-  echo "$as_me:9703: result: no" >&5
+  echo "$as_me:10251: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9710,7 +10258,7 @@ fi
        # Extract the first word of "lastlog", so it can be a program name with args.
 set dummy lastlog; ac_word=$2
-echo "$as_me:9713: checking for $ac_word" >&5
+echo "$as_me:10261: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_LASTLOG+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9727,7 +10275,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_LASTLOG="$ac_dir/$ac_word"
-   echo "$as_me:9730: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10278: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9738,10 +10286,10 @@ fi
 PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG
 if test -n "$PROG_LASTLOG"; then
-  echo "$as_me:9741: result: $PROG_LASTLOG" >&5
+  echo "$as_me:10289: result: $PROG_LASTLOG" >&5
 echo "${ECHO_T}$PROG_LASTLOG" >&6
 else
-  echo "$as_me:9744: result: no" >&5
+  echo "$as_me:10292: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9751,7 +10299,7 @@ fi
        # Extract the first word of "df", so it can be a program name with args.
 set dummy df; ac_word=$2
-echo "$as_me:9754: checking for $ac_word" >&5
+echo "$as_me:10302: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_DF+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9768,7 +10316,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_DF="$ac_dir/$ac_word"
-   echo "$as_me:9771: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10319: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9779,10 +10327,10 @@ fi
 PROG_DF=$ac_cv_path_PROG_DF
 if test -n "$PROG_DF"; then
-  echo "$as_me:9782: result: $PROG_DF" >&5
+  echo "$as_me:10330: result: $PROG_DF" >&5
 echo "${ECHO_T}$PROG_DF" >&6
 else
-  echo "$as_me:9785: result: no" >&5
+  echo "$as_me:10333: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9792,7 +10340,7 @@ fi
        # Extract the first word of "vmstat", so it can be a program name with args.
 set dummy vmstat; ac_word=$2
-echo "$as_me:9795: checking for $ac_word" >&5
+echo "$as_me:10343: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_VMSTAT+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9809,7 +10357,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_VMSTAT="$ac_dir/$ac_word"
-   echo "$as_me:9812: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10360: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9820,10 +10368,10 @@ fi
 PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT
 if test -n "$PROG_VMSTAT"; then
-  echo "$as_me:9823: result: $PROG_VMSTAT" >&5
+  echo "$as_me:10371: result: $PROG_VMSTAT" >&5
 echo "${ECHO_T}$PROG_VMSTAT" >&6
 else
-  echo "$as_me:9826: result: no" >&5
+  echo "$as_me:10374: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9833,7 +10381,7 @@ fi
        # Extract the first word of "uptime", so it can be a program name with args.
 set dummy uptime; ac_word=$2
-echo "$as_me:9836: checking for $ac_word" >&5
+echo "$as_me:10384: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_UPTIME+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9850,7 +10398,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_UPTIME="$ac_dir/$ac_word"
-   echo "$as_me:9853: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10401: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9861,10 +10409,10 @@ fi
 PROG_UPTIME=$ac_cv_path_PROG_UPTIME
 if test -n "$PROG_UPTIME"; then
-  echo "$as_me:9864: result: $PROG_UPTIME" >&5
+  echo "$as_me:10412: result: $PROG_UPTIME" >&5
 echo "${ECHO_T}$PROG_UPTIME" >&6
 else
-  echo "$as_me:9867: result: no" >&5
+  echo "$as_me:10415: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9874,7 +10422,7 @@ fi
        # Extract the first word of "ipcs", so it can be a program name with args.
 set dummy ipcs; ac_word=$2
-echo "$as_me:9877: checking for $ac_word" >&5
+echo "$as_me:10425: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_IPCS+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9891,7 +10439,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_IPCS="$ac_dir/$ac_word"
-   echo "$as_me:9894: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10442: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9902,10 +10450,10 @@ fi
 PROG_IPCS=$ac_cv_path_PROG_IPCS
 if test -n "$PROG_IPCS"; then
-  echo "$as_me:9905: result: $PROG_IPCS" >&5
+  echo "$as_me:10453: result: $PROG_IPCS" >&5
 echo "${ECHO_T}$PROG_IPCS" >&6
 else
-  echo "$as_me:9908: result: no" >&5
+  echo "$as_me:10456: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9915,7 +10463,7 @@ fi
        # Extract the first word of "tail", so it can be a program name with args.
 set dummy tail; ac_word=$2
-echo "$as_me:9918: checking for $ac_word" >&5
+echo "$as_me:10466: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PROG_TAIL+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9932,7 +10480,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_PROG_TAIL="$ac_dir/$ac_word"
-   echo "$as_me:9935: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10483: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -9943,10 +10491,10 @@ fi
 PROG_TAIL=$ac_cv_path_PROG_TAIL
 if test -n "$PROG_TAIL"; then
-  echo "$as_me:9946: result: $PROG_TAIL" >&5
+  echo "$as_me:10494: result: $PROG_TAIL" >&5
 echo "${ECHO_T}$PROG_TAIL" >&6
 else
-  echo "$as_me:9949: result: no" >&5
+  echo "$as_me:10497: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -9977,13 +10525,13 @@ if test ! -z "$SONY" ; then
 fi
 # Checks for data types
-echo "$as_me:9980: checking for char" >&5
+echo "$as_me:10528: checking for char" >&5
 echo $ECHO_N "checking for char... $ECHO_C" >&6
 if test "${ac_cv_type_char+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 9986 "configure"
+#line 10534 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9998,16 +10546,16 @@ if (sizeof (char))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10549: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10004: \$? = $ac_status" >&5
+  echo "$as_me:10552: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10555: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10010: \$? = $ac_status" >&5
+  echo "$as_me:10558: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_char=yes
 else
@@ -10017,10 +10565,10 @@ ac_cv_type_char=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10020: result: $ac_cv_type_char" >&5
+echo "$as_me:10568: result: $ac_cv_type_char" >&5
 echo "${ECHO_T}$ac_cv_type_char" >&6
-echo "$as_me:10023: checking size of char" >&5
+echo "$as_me:10571: checking size of char" >&5
 echo $ECHO_N "checking size of char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_char+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10029,7 +10577,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10032 "configure"
+#line 10580 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10041,21 +10589,21 @@ int _array_ [1 - 2 * !((sizeof (char)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10592: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10047: \$? = $ac_status" >&5
+  echo "$as_me:10595: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10598: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10053: \$? = $ac_status" >&5
+  echo "$as_me:10601: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10058 "configure"
+#line 10606 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10067,16 +10615,16 @@ int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10618: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10073: \$? = $ac_status" >&5
+  echo "$as_me:10621: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10624: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10079: \$? = $ac_status" >&5
+  echo "$as_me:10627: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10092,7 +10640,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10095 "configure"
+#line 10643 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10104,16 +10652,16 @@ int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10107: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10655: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10110: \$? = $ac_status" >&5
+  echo "$as_me:10658: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10661: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10116: \$? = $ac_status" >&5
+  echo "$as_me:10664: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10129,7 +10677,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
-#line 10132 "configure"
+#line 10680 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10141,16 +10689,16 @@ int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10692: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10147: \$? = $ac_status" >&5
+  echo "$as_me:10695: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10698: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10153: \$? = $ac_status" >&5
+  echo "$as_me:10701: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10163,12 +10711,12 @@ done
 ac_cv_sizeof_char=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10166: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:10714: 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 10171 "configure"
+#line 10719 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10184,15 +10732,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10735: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10190: \$? = $ac_status" >&5
+  echo "$as_me:10738: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10740: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10195: \$? = $ac_status" >&5
+  echo "$as_me:10743: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_char=`cat conftest.val`
 else
@@ -10208,19 +10756,19 @@ else
  ac_cv_sizeof_char=0
 fi
 fi
-echo "$as_me:10211: result: $ac_cv_sizeof_char" >&5
+echo "$as_me:10759: result: $ac_cv_sizeof_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_CHAR $ac_cv_sizeof_char
 EOF
-echo "$as_me:10217: checking for short int" >&5
+echo "$as_me:10765: checking for short int" >&5
 echo $ECHO_N "checking for short int... $ECHO_C" >&6
 if test "${ac_cv_type_short_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 10223 "configure"
+#line 10771 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10235,16 +10783,16 @@ if (sizeof (short int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10786: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10241: \$? = $ac_status" >&5
+  echo "$as_me:10789: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10792: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10247: \$? = $ac_status" >&5
+  echo "$as_me:10795: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_short_int=yes
 else
@@ -10254,10 +10802,10 @@ ac_cv_type_short_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10257: result: $ac_cv_type_short_int" >&5
+echo "$as_me:10805: result: $ac_cv_type_short_int" >&5
 echo "${ECHO_T}$ac_cv_type_short_int" >&6
-echo "$as_me:10260: checking size of short int" >&5
+echo "$as_me:10808: checking size of short int" >&5
 echo $ECHO_N "checking size of short int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_short_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10266,7 +10814,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10269 "configure"
+#line 10817 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10278,21 +10826,21 @@ int _array_ [1 - 2 * !((sizeof (short int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10829: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10284: \$? = $ac_status" >&5
+  echo "$as_me:10832: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10835: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10290: \$? = $ac_status" >&5
+  echo "$as_me:10838: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10295 "configure"
+#line 10843 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10304,16 +10852,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10855: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10310: \$? = $ac_status" >&5
+  echo "$as_me:10858: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10861: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10316: \$? = $ac_status" >&5
+  echo "$as_me:10864: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10329,7 +10877,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10332 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10341,16 +10889,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10892: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10347: \$? = $ac_status" >&5
+  echo "$as_me:10895: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10898: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10353: \$? = $ac_status" >&5
+  echo "$as_me:10901: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10366,7 +10914,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
-#line 10369 "configure"
+#line 10917 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10378,16 +10926,16 @@ int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10929: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10384: \$? = $ac_status" >&5
+  echo "$as_me:10932: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10935: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10390: \$? = $ac_status" >&5
+  echo "$as_me:10938: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10400,12 +10948,12 @@ done
 ac_cv_sizeof_short_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10403: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:10951: 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 10408 "configure"
+#line 10956 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10421,15 +10969,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10972: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10427: \$? = $ac_status" >&5
+  echo "$as_me:10975: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10977: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10432: \$? = $ac_status" >&5
+  echo "$as_me:10980: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_short_int=`cat conftest.val`
 else
@@ -10445,19 +10993,19 @@ else
  ac_cv_sizeof_short_int=0
 fi
 fi
-echo "$as_me:10448: result: $ac_cv_sizeof_short_int" >&5
+echo "$as_me:10996: result: $ac_cv_sizeof_short_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SHORT_INT $ac_cv_sizeof_short_int
 EOF
-echo "$as_me:10454: checking for int" >&5
+echo "$as_me:11002: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 10460 "configure"
+#line 11008 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10472,16 +11020,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10478: \$? = $ac_status" >&5
+  echo "$as_me:11026: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10484: \$? = $ac_status" >&5
+  echo "$as_me:11032: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_int=yes
 else
@@ -10491,10 +11039,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10494: result: $ac_cv_type_int" >&5
+echo "$as_me:11042: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
-echo "$as_me:10497: checking size of int" >&5
+echo "$as_me:11045: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10503,7 +11051,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10506 "configure"
+#line 11054 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10515,21 +11063,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10518: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11066: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10521: \$? = $ac_status" >&5
+  echo "$as_me:11069: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11072: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10527: \$? = $ac_status" >&5
+  echo "$as_me:11075: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10532 "configure"
+#line 11080 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10541,16 +11089,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10547: \$? = $ac_status" >&5
+  echo "$as_me:11095: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11098: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10553: \$? = $ac_status" >&5
+  echo "$as_me:11101: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10566,7 +11114,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10569 "configure"
+#line 11117 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10578,16 +11126,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11129: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10584: \$? = $ac_status" >&5
+  echo "$as_me:11132: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11135: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10590: \$? = $ac_status" >&5
+  echo "$as_me:11138: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10603,7 +11151,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
-#line 10606 "configure"
+#line 11154 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10615,16 +11163,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11166: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10621: \$? = $ac_status" >&5
+  echo "$as_me:11169: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11172: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10627: \$? = $ac_status" >&5
+  echo "$as_me:11175: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10637,12 +11185,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10640: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11188: 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 10645 "configure"
+#line 11193 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10658,15 +11206,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11209: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10664: \$? = $ac_status" >&5
+  echo "$as_me:11212: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11214: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10669: \$? = $ac_status" >&5
+  echo "$as_me:11217: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -10682,19 +11230,19 @@ else
  ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:10685: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:11233: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
-echo "$as_me:10691: checking for long int" >&5
+echo "$as_me:11239: checking for long int" >&5
 echo $ECHO_N "checking for long int... $ECHO_C" >&6
 if test "${ac_cv_type_long_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 10697 "configure"
+#line 11245 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10709,16 +11257,16 @@ if (sizeof (long int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11260: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10715: \$? = $ac_status" >&5
+  echo "$as_me:11263: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11266: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10721: \$? = $ac_status" >&5
+  echo "$as_me:11269: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_long_int=yes
 else
@@ -10728,10 +11276,10 @@ ac_cv_type_long_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10731: result: $ac_cv_type_long_int" >&5
+echo "$as_me:11279: result: $ac_cv_type_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_int" >&6
-echo "$as_me:10734: checking size of long int" >&5
+echo "$as_me:11282: checking size of long int" >&5
 echo $ECHO_N "checking size of long int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10740,7 +11288,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10743 "configure"
+#line 11291 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10752,21 +11300,21 @@ int _array_ [1 - 2 * !((sizeof (long int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10758: \$? = $ac_status" >&5
+  echo "$as_me:11306: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11309: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10764: \$? = $ac_status" >&5
+  echo "$as_me:11312: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10769 "configure"
+#line 11317 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10778,16 +11326,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11329: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10784: \$? = $ac_status" >&5
+  echo "$as_me:11332: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11335: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10790: \$? = $ac_status" >&5
+  echo "$as_me:11338: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -10803,7 +11351,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 10806 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10815,16 +11363,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11366: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10821: \$? = $ac_status" >&5
+  echo "$as_me:11369: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11372: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10827: \$? = $ac_status" >&5
+  echo "$as_me:11375: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -10840,7 +11388,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
-#line 10843 "configure"
+#line 11391 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10852,16 +11400,16 @@ int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11403: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10858: \$? = $ac_status" >&5
+  echo "$as_me:11406: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11409: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10864: \$? = $ac_status" >&5
+  echo "$as_me:11412: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -10874,12 +11422,12 @@ done
 ac_cv_sizeof_long_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:10877: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11425: 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 10882 "configure"
+#line 11430 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10895,15 +11443,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11446: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:10901: \$? = $ac_status" >&5
+  echo "$as_me:11449: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11451: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10906: \$? = $ac_status" >&5
+  echo "$as_me:11454: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_long_int=`cat conftest.val`
 else
@@ -10919,19 +11467,19 @@ else
  ac_cv_sizeof_long_int=0
 fi
 fi
-echo "$as_me:10922: result: $ac_cv_sizeof_long_int" >&5
+echo "$as_me:11470: result: $ac_cv_sizeof_long_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
 EOF
-echo "$as_me:10928: checking for long long int" >&5
+echo "$as_me:11476: checking for long long int" >&5
 echo $ECHO_N "checking for long long int... $ECHO_C" >&6
 if test "${ac_cv_type_long_long_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 10934 "configure"
+#line 11482 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10946,16 +11494,16 @@ if (sizeof (long long int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11497: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10952: \$? = $ac_status" >&5
+  echo "$as_me:11500: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11503: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:10958: \$? = $ac_status" >&5
+  echo "$as_me:11506: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_long_long_int=yes
 else
@@ -10965,10 +11513,10 @@ ac_cv_type_long_long_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10968: result: $ac_cv_type_long_long_int" >&5
+echo "$as_me:11516: result: $ac_cv_type_long_long_int" >&5
 echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-echo "$as_me:10971: checking size of long long int" >&5
+echo "$as_me:11519: checking size of long long int" >&5
 echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long_long_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10977,7 +11525,7 @@ else
  if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 10980 "configure"
+#line 11528 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10989,21 +11537,21 @@ int _array_ [1 - 2 * !((sizeof (long long int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11540: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:10995: \$? = $ac_status" >&5
+  echo "$as_me:11543: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11001: \$? = $ac_status" >&5
+  echo "$as_me:11549: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11006 "configure"
+#line 11554 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11015,16 +11563,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11566: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11021: \$? = $ac_status" >&5
+  echo "$as_me:11569: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11572: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11027: \$? = $ac_status" >&5
+  echo "$as_me:11575: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
 else
@@ -11040,7 +11588,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
-#line 11043 "configure"
+#line 11591 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11052,16 +11600,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11603: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11058: \$? = $ac_status" >&5
+  echo "$as_me:11606: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11609: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11612: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
 else
@@ -11077,7 +11625,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
-#line 11080 "configure"
+#line 11628 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11089,16 +11637,16 @@ int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11095: \$? = $ac_status" >&5
+  echo "$as_me:11643: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11646: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11101: \$? = $ac_status" >&5
+  echo "$as_me:11649: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
 else
@@ -11111,12 +11659,12 @@ done
 ac_cv_sizeof_long_long_int=$ac_lo
 else
  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:11114: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:11662: 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 11119 "configure"
+#line 11667 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -11132,15 +11680,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11683: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:11138: \$? = $ac_status" >&5
+  echo "$as_me:11686: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11688: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11143: \$? = $ac_status" >&5
+  echo "$as_me:11691: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_sizeof_long_long_int=`cat conftest.val`
 else
@@ -11156,7 +11704,7 @@ else
  ac_cv_sizeof_long_long_int=0
 fi
 fi
-echo "$as_me:11159: result: $ac_cv_sizeof_long_long_int" >&5
+echo "$as_me:11707: result: $ac_cv_sizeof_long_long_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
@@ -11168,14 +11716,14 @@ if test "x$ac_cv_sizeof_long_long_int" = "x4" ; then
 fi
 # More checks for data types
-echo "$as_me:11171: checking for u_int type" >&5
+echo "$as_me:11719: checking for u_int type" >&5
 echo $ECHO_N "checking for u_int type... $ECHO_C" >&6
 if test "${ac_cv_have_u_int+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11178 "configure"
+#line 11726 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11187,16 +11735,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11738: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11193: \$? = $ac_status" >&5
+  echo "$as_me:11741: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11744: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11199: \$? = $ac_status" >&5
+  echo "$as_me:11747: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_int="yes"
 else
@@ -11208,7 +11756,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11211: result: $ac_cv_have_u_int" >&5
+echo "$as_me:11759: result: $ac_cv_have_u_int" >&5
 echo "${ECHO_T}$ac_cv_have_u_int" >&6
 if test "x$ac_cv_have_u_int" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11218,14 +11766,14 @@ EOF
        have_u_int=1
 fi
-echo "$as_me:11221: checking for intXX_t types" >&5
+echo "$as_me:11769: checking for intXX_t types" >&5
 echo $ECHO_N "checking for intXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_intxx_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11228 "configure"
+#line 11776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11237,16 +11785,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11788: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11243: \$? = $ac_status" >&5
+  echo "$as_me:11791: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11794: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11249: \$? = $ac_status" >&5
+  echo "$as_me:11797: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_intxx_t="yes"
 else
@@ -11258,7 +11806,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11261: result: $ac_cv_have_intxx_t" >&5
+echo "$as_me:11809: result: $ac_cv_have_intxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_intxx_t" >&6
 if test "x$ac_cv_have_intxx_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11269,12 +11817,12 @@ EOF
 fi
 if (test -z "$have_intxx_t" && \
-           test "x$ac_cv_header_stdint_h" = "xyes")
+           test "x$ac_cv_header_stdint_h" = "xyes")
 then
-    echo "$as_me:11274: checking for intXX_t types in stdint.h" >&5
+    echo "$as_me:11822: checking for intXX_t types in stdint.h" >&5
 echo $ECHO_N "checking for intXX_t types in stdint.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 11277 "configure"
+#line 11825 "configure"
 #include "confdefs.h"
 #include <stdint.h>
 int
@@ -11286,43 +11834,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11289: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11292: \$? = $ac_status" >&5
+  echo "$as_me:11840: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11298: \$? = $ac_status" >&5
+  echo "$as_me:11846: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_INTXX_T 1
 EOF
-                        echo "$as_me:11305: result: yes" >&5
+                        echo "$as_me:11853: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:11311: result: no" >&5
+ echo "$as_me:11859: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11318: checking for int64_t type" >&5
+echo "$as_me:11866: checking for int64_t type" >&5
 echo $ECHO_N "checking for int64_t type... $ECHO_C" >&6
 if test "${ac_cv_have_int64_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11325 "configure"
+#line 11873 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -11343,16 +11891,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11349: \$? = $ac_status" >&5
+  echo "$as_me:11897: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11355: \$? = $ac_status" >&5
+  echo "$as_me:11903: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_int64_t="yes"
 else
@@ -11364,7 +11912,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11367: result: $ac_cv_have_int64_t" >&5
+echo "$as_me:11915: result: $ac_cv_have_int64_t" >&5
 echo "${ECHO_T}$ac_cv_have_int64_t" >&6
 if test "x$ac_cv_have_int64_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11373,14 +11921,14 @@ EOF
 fi
-echo "$as_me:11376: checking for u_intXX_t types" >&5
+echo "$as_me:11924: checking for u_intXX_t types" >&5
 echo $ECHO_N "checking for u_intXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_u_intxx_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11383 "configure"
+#line 11931 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11392,16 +11940,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11395: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11398: \$? = $ac_status" >&5
+  echo "$as_me:11946: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11949: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11404: \$? = $ac_status" >&5
+  echo "$as_me:11952: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_intxx_t="yes"
 else
@@ -11413,7 +11961,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11416: result: $ac_cv_have_u_intxx_t" >&5
+echo "$as_me:11964: result: $ac_cv_have_u_intxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_u_intxx_t" >&6
 if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11424,10 +11972,10 @@ EOF
 fi
 if test -z "$have_u_intxx_t" ; then
-    echo "$as_me:11427: checking for u_intXX_t types in sys/socket.h" >&5
+    echo "$as_me:11975: checking for u_intXX_t types in sys/socket.h" >&5
 echo $ECHO_N "checking for u_intXX_t types in sys/socket.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 11430 "configure"
+#line 11978 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int
@@ -11439,43 +11987,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11990: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11445: \$? = $ac_status" >&5
+  echo "$as_me:11993: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11996: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11451: \$? = $ac_status" >&5
+  echo "$as_me:11999: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_U_INTXX_T 1
 EOF
-                        echo "$as_me:11458: result: yes" >&5
+                        echo "$as_me:12006: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:11464: result: no" >&5
+ echo "$as_me:12012: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11471: checking for u_int64_t types" >&5
+echo "$as_me:12019: checking for u_int64_t types" >&5
 echo $ECHO_N "checking for u_int64_t types... $ECHO_C" >&6
 if test "${ac_cv_have_u_int64_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11478 "configure"
+#line 12026 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11487,16 +12035,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12038: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11493: \$? = $ac_status" >&5
+  echo "$as_me:12041: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12044: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11499: \$? = $ac_status" >&5
+  echo "$as_me:12047: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_int64_t="yes"
 else
@@ -11508,7 +12056,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11511: result: $ac_cv_have_u_int64_t" >&5
+echo "$as_me:12059: result: $ac_cv_have_u_int64_t" >&5
 echo "${ECHO_T}$ac_cv_have_u_int64_t" >&6
 if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11519,10 +12067,10 @@ EOF
 fi
 if test -z "$have_u_int64_t" ; then
-    echo "$as_me:11522: checking for u_int64_t type in sys/bitypes.h" >&5
+    echo "$as_me:12070: checking for u_int64_t type in sys/bitypes.h" >&5
 echo $ECHO_N "checking for u_int64_t type in sys/bitypes.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 11525 "configure"
+#line 12073 "configure"
 #include "confdefs.h"
 #include <sys/bitypes.h>
 int
@@ -11534,29 +12082,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12085: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11540: \$? = $ac_status" >&5
+  echo "$as_me:12088: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12091: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11546: \$? = $ac_status" >&5
+  echo "$as_me:12094: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_U_INT64_T 1
 EOF
-                        echo "$as_me:11553: result: yes" >&5
+                        echo "$as_me:12101: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:11559: result: no" >&5
+ echo "$as_me:12107: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -11564,14 +12112,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 if test -z "$have_u_intxx_t" ; then
-        echo "$as_me:11567: checking for uintXX_t types" >&5
+        echo "$as_me:12115: checking for uintXX_t types" >&5
 echo $ECHO_N "checking for uintXX_t types... $ECHO_C" >&6
 if test "${ac_cv_have_uintxx_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 11574 "configure"
+#line 12122 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -11585,16 +12133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12136: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11591: \$? = $ac_status" >&5
+  echo "$as_me:12139: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12142: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11597: \$? = $ac_status" >&5
+  echo "$as_me:12145: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_uintxx_t="yes"
 else
@@ -11606,7 +12154,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11609: result: $ac_cv_have_uintxx_t" >&5
+echo "$as_me:12157: result: $ac_cv_have_uintxx_t" >&5
 echo "${ECHO_T}$ac_cv_have_uintxx_t" >&6
        if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
                cat >>confdefs.h <<\EOF
@@ -11617,10 +12165,10 @@ EOF
 fi
 if test -z "$have_uintxx_t" ; then
-    echo "$as_me:11620: checking for uintXX_t types in stdint.h" >&5
+    echo "$as_me:12168: checking for uintXX_t types in stdint.h" >&5
 echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 11623 "configure"
+#line 12171 "configure"
 #include "confdefs.h"
 #include <stdint.h>
 int
@@ -11632,29 +12180,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12183: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11638: \$? = $ac_status" >&5
+  echo "$as_me:12186: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12189: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11644: \$? = $ac_status" >&5
+  echo "$as_me:12192: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
 #define HAVE_UINTXX_T 1
 EOF
-                        echo "$as_me:11651: result: yes" >&5
+                        echo "$as_me:12199: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:11657: result: no" >&5
+ echo "$as_me:12205: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -11662,12 +12210,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
-           test "x$ac_cv_header_sys_bitypes_h" = "xyes")
+           test "x$ac_cv_header_sys_bitypes_h" = "xyes")
 then
-        echo "$as_me:11667: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
+        echo "$as_me:12215: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5
 echo $ECHO_N "checking for intXX_t and u_intXX_t types in sys/bitypes.h... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 11670 "configure"
+#line 12218 "configure"
 #include "confdefs.h"
 #include <sys/bitypes.h>
@@ -11685,16 +12233,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12236: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11691: \$? = $ac_status" >&5
+  echo "$as_me:12239: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11697: \$? = $ac_status" >&5
+  echo "$as_me:12245: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                        cat >>confdefs.h <<\EOF
@@ -11705,27 +12253,27 @@ EOF
 #define HAVE_INTXX_T 1
 EOF
-                        echo "$as_me:11708: result: yes" >&5
+                        echo "$as_me:12256: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11714: result: no" >&5
+echo "$as_me:12262: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11721: checking for u_char" >&5
+echo "$as_me:12269: checking for u_char" >&5
 echo $ECHO_N "checking for u_char... $ECHO_C" >&6
 if test "${ac_cv_have_u_char+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11728 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -11739,16 +12287,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11745: \$? = $ac_status" >&5
+  echo "$as_me:12293: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12296: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11751: \$? = $ac_status" >&5
+  echo "$as_me:12299: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_u_char="yes"
 else
@@ -11760,7 +12308,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11763: result: $ac_cv_have_u_char" >&5
+echo "$as_me:12311: result: $ac_cv_have_u_char" >&5
 echo "${ECHO_T}$ac_cv_have_u_char" >&6
 if test "x$ac_cv_have_u_char" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11769,13 +12317,13 @@ EOF
 fi
-   echo "$as_me:11772: checking for socklen_t" >&5
+   echo "$as_me:12320: 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 11778 "configure"
+#line 12326 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11792,16 +12340,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11798: \$? = $ac_status" >&5
+  echo "$as_me:12346: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11804: \$? = $ac_status" >&5
+  echo "$as_me:12352: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_socklen_t=yes
 else
@@ -11811,13 +12359,13 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11814: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:12362: 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
  :
 else
-      echo "$as_me:11820: checking for socklen_t equivalent" >&5
+      echo "$as_me:12368: checking for socklen_t equivalent" >&5
 echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6
      if test "${curl_cv_socklen_t_equiv+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11829,7 +12377,7 @@ else
         for arg2 in "struct sockaddr" void; do
            for t in int size_t unsigned long "unsigned long"; do
               cat >conftest.$ac_ext <<_ACEOF
-#line 11832 "configure"
+#line 12380 "configure"
 #include "confdefs.h"
                  #include <sys/types.h>
@@ -11849,16 +12397,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12400: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11855: \$? = $ac_status" >&5
+  echo "$as_me:12403: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12406: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11861: \$? = $ac_status" >&5
+  echo "$as_me:12409: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
                  curl_cv_socklen_t_equiv="$t"
@@ -11873,14 +12421,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
         done
         if test "x$curl_cv_socklen_t_equiv" = x; then
-            { { echo "$as_me:11876: error: Cannot find a type to use in place of socklen_t" >&5
+            { { echo "$as_me:12424: error: Cannot find a type to use in place of socklen_t" >&5
 echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;}
   { (exit 1); exit 1; }; }
         fi
 fi
-      echo "$as_me:11883: result: $curl_cv_socklen_t_equiv" >&5
+      echo "$as_me:12431: result: $curl_cv_socklen_t_equiv" >&5
 echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6
 cat >>confdefs.h <<EOF
@@ -11889,13 +12437,13 @@ EOF
 fi
-echo "$as_me:11892: checking for sig_atomic_t" >&5
+echo "$as_me:12440: 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 11898 "configure"
+#line 12446 "configure"
 #include "confdefs.h"
 #include <signal.h>
@@ -11911,16 +12459,16 @@ if (sizeof (sig_atomic_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12462: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11917: \$? = $ac_status" >&5
+  echo "$as_me:12465: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12468: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11923: \$? = $ac_status" >&5
+  echo "$as_me:12471: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_sig_atomic_t=yes
 else
@@ -11930,7 +12478,7 @@ ac_cv_type_sig_atomic_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11933: result: $ac_cv_type_sig_atomic_t" >&5
+echo "$as_me:12481: 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 = yes; then
@@ -11940,14 +12488,14 @@ EOF
 fi
-echo "$as_me:11943: checking for size_t" >&5
+echo "$as_me:12491: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_have_size_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 11950 "configure"
+#line 12498 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -11961,16 +12509,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12512: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11967: \$? = $ac_status" >&5
+  echo "$as_me:12515: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12518: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11973: \$? = $ac_status" >&5
+  echo "$as_me:12521: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_size_t="yes"
 else
@@ -11982,7 +12530,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11985: result: $ac_cv_have_size_t" >&5
+echo "$as_me:12533: result: $ac_cv_have_size_t" >&5
 echo "${ECHO_T}$ac_cv_have_size_t" >&6
 if test "x$ac_cv_have_size_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -11991,14 +12539,14 @@ EOF
 fi
-echo "$as_me:11994: checking for ssize_t" >&5
+echo "$as_me:12542: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_have_ssize_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12001 "configure"
+#line 12549 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12012,16 +12560,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12563: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12018: \$? = $ac_status" >&5
+  echo "$as_me:12566: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12569: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12024: \$? = $ac_status" >&5
+  echo "$as_me:12572: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_ssize_t="yes"
 else
@@ -12033,7 +12581,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12036: result: $ac_cv_have_ssize_t" >&5
+echo "$as_me:12584: result: $ac_cv_have_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_have_ssize_t" >&6
 if test "x$ac_cv_have_ssize_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12042,14 +12590,14 @@ EOF
 fi
-echo "$as_me:12045: checking for clock_t" >&5
+echo "$as_me:12593: checking for clock_t" >&5
 echo $ECHO_N "checking for clock_t... $ECHO_C" >&6
 if test "${ac_cv_have_clock_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12052 "configure"
+#line 12600 "configure"
 #include "confdefs.h"
 #include <time.h>
@@ -12063,16 +12611,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12614: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12069: \$? = $ac_status" >&5
+  echo "$as_me:12617: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12620: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12075: \$? = $ac_status" >&5
+  echo "$as_me:12623: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_clock_t="yes"
 else
@@ -12084,7 +12632,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12087: result: $ac_cv_have_clock_t" >&5
+echo "$as_me:12635: result: $ac_cv_have_clock_t" >&5
 echo "${ECHO_T}$ac_cv_have_clock_t" >&6
 if test "x$ac_cv_have_clock_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12093,14 +12641,14 @@ EOF
 fi
-echo "$as_me:12096: checking for sa_family_t" >&5
+echo "$as_me:12644: checking for sa_family_t" >&5
 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
 if test "${ac_cv_have_sa_family_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12103 "configure"
+#line 12651 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12115,23 +12663,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12666: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12121: \$? = $ac_status" >&5
+  echo "$as_me:12669: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12672: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12127: \$? = $ac_status" >&5
+  echo "$as_me:12675: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_sa_family_t="yes"
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 12134 "configure"
+#line 12682 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12147,16 +12695,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12698: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12153: \$? = $ac_status" >&5
+  echo "$as_me:12701: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12704: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12159: \$? = $ac_status" >&5
+  echo "$as_me:12707: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_sa_family_t="yes"
 else
@@ -12171,7 +12719,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12174: result: $ac_cv_have_sa_family_t" >&5
+echo "$as_me:12722: result: $ac_cv_have_sa_family_t" >&5
 echo "${ECHO_T}$ac_cv_have_sa_family_t" >&6
 if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12180,14 +12728,14 @@ EOF
 fi
-echo "$as_me:12183: checking for pid_t" >&5
+echo "$as_me:12731: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_have_pid_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12190 "configure"
+#line 12738 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12201,16 +12749,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12752: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12207: \$? = $ac_status" >&5
+  echo "$as_me:12755: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12758: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12213: \$? = $ac_status" >&5
+  echo "$as_me:12761: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pid_t="yes"
 else
@@ -12222,7 +12770,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12225: result: $ac_cv_have_pid_t" >&5
+echo "$as_me:12773: result: $ac_cv_have_pid_t" >&5
 echo "${ECHO_T}$ac_cv_have_pid_t" >&6
 if test "x$ac_cv_have_pid_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12231,14 +12779,14 @@ EOF
 fi
-echo "$as_me:12234: checking for mode_t" >&5
+echo "$as_me:12782: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_have_mode_t+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12241 "configure"
+#line 12789 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12252,16 +12800,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12255: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12803: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12258: \$? = $ac_status" >&5
+  echo "$as_me:12806: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12809: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12264: \$? = $ac_status" >&5
+  echo "$as_me:12812: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_mode_t="yes"
 else
@@ -12273,7 +12821,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12276: result: $ac_cv_have_mode_t" >&5
+echo "$as_me:12824: result: $ac_cv_have_mode_t" >&5
 echo "${ECHO_T}$ac_cv_have_mode_t" >&6
 if test "x$ac_cv_have_mode_t" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12282,14 +12830,14 @@ EOF
 fi
-echo "$as_me:12285: checking for struct sockaddr_storage" >&5
+echo "$as_me:12833: checking for struct sockaddr_storage" >&5
 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have_struct_sockaddr_storage+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12292 "configure"
+#line 12840 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12304,16 +12852,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12855: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12310: \$? = $ac_status" >&5
+  echo "$as_me:12858: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12316: \$? = $ac_status" >&5
+  echo "$as_me:12864: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_sockaddr_storage="yes"
 else
@@ -12325,7 +12873,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12328: result: $ac_cv_have_struct_sockaddr_storage" >&5
+echo "$as_me:12876: result: $ac_cv_have_struct_sockaddr_storage" >&5
 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_storage" >&6
 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12334,14 +12882,14 @@ EOF
 fi
-echo "$as_me:12337: checking for struct sockaddr_in6" >&5
+echo "$as_me:12885: checking for struct sockaddr_in6" >&5
 echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6
 if test "${ac_cv_have_struct_sockaddr_in6+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12344 "configure"
+#line 12892 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12356,16 +12904,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12907: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12362: \$? = $ac_status" >&5
+  echo "$as_me:12910: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12368: \$? = $ac_status" >&5
+  echo "$as_me:12916: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_sockaddr_in6="yes"
 else
@@ -12377,7 +12925,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12380: result: $ac_cv_have_struct_sockaddr_in6" >&5
+echo "$as_me:12928: result: $ac_cv_have_struct_sockaddr_in6" >&5
 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_in6" >&6
 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12386,14 +12934,14 @@ EOF
 fi
-echo "$as_me:12389: checking for struct in6_addr" >&5
+echo "$as_me:12937: checking for struct in6_addr" >&5
 echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6
 if test "${ac_cv_have_struct_in6_addr+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12396 "configure"
+#line 12944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12408,16 +12956,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12959: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12414: \$? = $ac_status" >&5
+  echo "$as_me:12962: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12965: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12420: \$? = $ac_status" >&5
+  echo "$as_me:12968: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_in6_addr="yes"
 else
@@ -12429,7 +12977,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12432: result: $ac_cv_have_struct_in6_addr" >&5
+echo "$as_me:12980: result: $ac_cv_have_struct_in6_addr" >&5
 echo "${ECHO_T}$ac_cv_have_struct_in6_addr" >&6
 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12438,14 +12986,14 @@ EOF
 fi
-echo "$as_me:12441: checking for struct addrinfo" >&5
+echo "$as_me:12989: checking for struct addrinfo" >&5
 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
 if test "${ac_cv_have_struct_addrinfo+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12448 "configure"
+#line 12996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -12461,16 +13009,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12467: \$? = $ac_status" >&5
+  echo "$as_me:13015: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12473: \$? = $ac_status" >&5
+  echo "$as_me:13021: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_addrinfo="yes"
 else
@@ -12482,7 +13030,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12485: result: $ac_cv_have_struct_addrinfo" >&5
+echo "$as_me:13033: result: $ac_cv_have_struct_addrinfo" >&5
 echo "${ECHO_T}$ac_cv_have_struct_addrinfo" >&6
 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12491,14 +13039,14 @@ EOF
 fi
-echo "$as_me:12494: checking for struct timeval" >&5
+echo "$as_me:13042: checking for struct timeval" >&5
 echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6
 if test "${ac_cv_have_struct_timeval+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 12501 "configure"
+#line 13049 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -12510,16 +13058,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13061: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12516: \$? = $ac_status" >&5
+  echo "$as_me:13064: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13067: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12522: \$? = $ac_status" >&5
+  echo "$as_me:13070: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_struct_timeval="yes"
 else
@@ -12531,7 +13079,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12534: result: $ac_cv_have_struct_timeval" >&5
+echo "$as_me:13082: result: $ac_cv_have_struct_timeval" >&5
 echo "${ECHO_T}$ac_cv_have_struct_timeval" >&6
 if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -12541,13 +13089,13 @@ EOF
        have_struct_timeval=1
 fi
-echo "$as_me:12544: checking for struct timespec" >&5
+echo "$as_me:13092: checking for struct timespec" >&5
 echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
 if test "${ac_cv_type_struct_timespec+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 12550 "configure"
+#line 13098 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -12562,16 +13110,16 @@ if (sizeof (struct timespec))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13113: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:12568: \$? = $ac_status" >&5
+  echo "$as_me:13116: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13119: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12574: \$? = $ac_status" >&5
+  echo "$as_me:13122: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_struct_timespec=yes
 else
@@ -12581,7 +13129,7 @@ ac_cv_type_struct_timespec=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:12584: result: $ac_cv_type_struct_timespec" >&5
+echo "$as_me:13132: result: $ac_cv_type_struct_timespec" >&5
 echo "${ECHO_T}$ac_cv_type_struct_timespec" >&6
 if test $ac_cv_type_struct_timespec = yes; then
@@ -12601,12 +13149,12 @@ if test "x$ac_cv_have_int64_t" = "xno" -a \
        exit 1;
 else
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:12604: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:13152: 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 12609 "configure"
+#line 13157 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -12625,7 +13173,7 @@ main()
        strcpy(expected_out, "9223372036854775807");
        snprintf(buf, mazsize, "%lld", num);
        if(strcmp(buf, expected_out) != 0)
-                exit(1);
+                exit(1);
        exit(0);
 }
 #else
@@ -12634,15 +13182,15 @@ main() { exit(0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13185: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:12640: \$? = $ac_status" >&5
+  echo "$as_me:13188: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13190: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:12645: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   true
 else
@@ -12661,14 +13209,14 @@ fi
 # look for field 'ut_host' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
-        echo "$as_me:12664: checking for ut_host field in utmp.h" >&5
+        echo "$as_me:13212: checking for ut_host field in utmp.h" >&5
 echo $ECHO_N "checking for ut_host field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12671 "configure"
+#line 13219 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -12685,7 +13233,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12688: result: $ossh_result" >&5
+                echo "$as_me:13236: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12694,21 +13242,21 @@ EOF
                fi
        else
-                echo "$as_me:12697: result: no" >&5
+                echo "$as_me:13245: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_host' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host
-        echo "$as_me:12704: checking for ut_host field in utmpx.h" >&5
+        echo "$as_me:13252: checking for ut_host field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_host field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12711 "configure"
+#line 13259 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -12725,7 +13273,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12728: result: $ossh_result" >&5
+                echo "$as_me:13276: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12734,21 +13282,21 @@ EOF
                fi
        else
-                echo "$as_me:12737: result: no" >&5
+                echo "$as_me:13285: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'syslen' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"syslen
-        echo "$as_me:12744: checking for syslen field in utmpx.h" >&5
+        echo "$as_me:13292: checking for syslen field in utmpx.h" >&5
 echo $ECHO_N "checking for syslen field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12751 "configure"
+#line 13299 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -12765,7 +13313,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12768: result: $ossh_result" >&5
+                echo "$as_me:13316: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12774,21 +13322,21 @@ EOF
                fi
        else
-                echo "$as_me:12777: result: no" >&5
+                echo "$as_me:13325: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_pid' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid
-        echo "$as_me:12784: checking for ut_pid field in utmp.h" >&5
+        echo "$as_me:13332: checking for ut_pid field in utmp.h" >&5
 echo $ECHO_N "checking for ut_pid field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12791 "configure"
+#line 13339 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -12805,7 +13353,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12808: result: $ossh_result" >&5
+                echo "$as_me:13356: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12814,21 +13362,21 @@ EOF
                fi
        else
-                echo "$as_me:12817: result: no" >&5
+                echo "$as_me:13365: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_type' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
-        echo "$as_me:12824: checking for ut_type field in utmp.h" >&5
+        echo "$as_me:13372: checking for ut_type field in utmp.h" >&5
 echo $ECHO_N "checking for ut_type field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12831 "configure"
+#line 13379 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -12845,7 +13393,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12848: result: $ossh_result" >&5
+                echo "$as_me:13396: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12854,21 +13402,21 @@ EOF
                fi
        else
-                echo "$as_me:12857: result: no" >&5
+                echo "$as_me:13405: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_type' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type
-        echo "$as_me:12864: checking for ut_type field in utmpx.h" >&5
+        echo "$as_me:13412: checking for ut_type field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_type field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12871 "configure"
+#line 13419 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -12885,7 +13433,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12888: result: $ossh_result" >&5
+                echo "$as_me:13436: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12894,21 +13442,21 @@ EOF
                fi
        else
-                echo "$as_me:12897: result: no" >&5
+                echo "$as_me:13445: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_tv' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
-        echo "$as_me:12904: checking for ut_tv field in utmp.h" >&5
+        echo "$as_me:13452: checking for ut_tv field in utmp.h" >&5
 echo $ECHO_N "checking for ut_tv field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12911 "configure"
+#line 13459 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -12925,7 +13473,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12928: result: $ossh_result" >&5
+                echo "$as_me:13476: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12934,21 +13482,21 @@ EOF
                fi
        else
-                echo "$as_me:12937: result: no" >&5
+                echo "$as_me:13485: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_id' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
-        echo "$as_me:12944: checking for ut_id field in utmp.h" >&5
+        echo "$as_me:13492: checking for ut_id field in utmp.h" >&5
 echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12951 "configure"
+#line 13499 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -12965,7 +13513,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:12968: result: $ossh_result" >&5
+                echo "$as_me:13516: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -12974,21 +13522,21 @@ EOF
                fi
        else
-                echo "$as_me:12977: result: no" >&5
+                echo "$as_me:13525: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_id' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id
-        echo "$as_me:12984: checking for ut_id field in utmpx.h" >&5
+        echo "$as_me:13532: checking for ut_id field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 12991 "configure"
+#line 13539 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13005,7 +13553,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13008: result: $ossh_result" >&5
+                echo "$as_me:13556: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13014,21 +13562,21 @@ EOF
                fi
        else
-                echo "$as_me:13017: result: no" >&5
+                echo "$as_me:13565: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_addr' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
-        echo "$as_me:13024: checking for ut_addr field in utmp.h" >&5
+        echo "$as_me:13572: checking for ut_addr field in utmp.h" >&5
 echo $ECHO_N "checking for ut_addr field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13031 "configure"
+#line 13579 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13045,7 +13593,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13048: result: $ossh_result" >&5
+                echo "$as_me:13596: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13054,21 +13602,21 @@ EOF
                fi
        else
-                echo "$as_me:13057: result: no" >&5
+                echo "$as_me:13605: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_addr' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr
-        echo "$as_me:13064: checking for ut_addr field in utmpx.h" >&5
+        echo "$as_me:13612: checking for ut_addr field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13071 "configure"
+#line 13619 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13085,7 +13633,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13088: result: $ossh_result" >&5
+                echo "$as_me:13636: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13094,21 +13642,21 @@ EOF
                fi
        else
-                echo "$as_me:13097: result: no" >&5
+                echo "$as_me:13645: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_addr_v6' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
-        echo "$as_me:13104: checking for ut_addr_v6 field in utmp.h" >&5
+        echo "$as_me:13652: checking for ut_addr_v6 field in utmp.h" >&5
 echo $ECHO_N "checking for ut_addr_v6 field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13111 "configure"
+#line 13659 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13125,7 +13673,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13128: result: $ossh_result" >&5
+                echo "$as_me:13676: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13134,21 +13682,21 @@ EOF
                fi
        else
-                echo "$as_me:13137: result: no" >&5
+                echo "$as_me:13685: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_addr_v6' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6
-        echo "$as_me:13144: checking for ut_addr_v6 field in utmpx.h" >&5
+        echo "$as_me:13692: checking for ut_addr_v6 field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_addr_v6 field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13151 "configure"
+#line 13699 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13165,7 +13713,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13168: result: $ossh_result" >&5
+                echo "$as_me:13716: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13174,21 +13722,21 @@ EOF
                fi
        else
-                echo "$as_me:13177: result: no" >&5
+                echo "$as_me:13725: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_exit' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit
-        echo "$as_me:13184: checking for ut_exit field in utmp.h" >&5
+        echo "$as_me:13732: checking for ut_exit field in utmp.h" >&5
 echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13191 "configure"
+#line 13739 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13205,7 +13753,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13208: result: $ossh_result" >&5
+                echo "$as_me:13756: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13214,21 +13762,21 @@ EOF
                fi
        else
-                echo "$as_me:13217: result: no" >&5
+                echo "$as_me:13765: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_time' in header 'utmp.h'
                ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
-        echo "$as_me:13224: checking for ut_time field in utmp.h" >&5
+        echo "$as_me:13772: checking for ut_time field in utmp.h" >&5
 echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13231 "configure"
+#line 13779 "configure"
 #include "confdefs.h"
 #include <utmp.h>
@@ -13245,7 +13793,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13248: result: $ossh_result" >&5
+                echo "$as_me:13796: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13254,21 +13802,21 @@ EOF
                fi
        else
-                echo "$as_me:13257: result: no" >&5
+                echo "$as_me:13805: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_time' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time
-        echo "$as_me:13264: checking for ut_time field in utmpx.h" >&5
+        echo "$as_me:13812: checking for ut_time field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13271 "configure"
+#line 13819 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13285,7 +13833,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13288: result: $ossh_result" >&5
+                echo "$as_me:13836: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13294,21 +13842,21 @@ EOF
                fi
        else
-                echo "$as_me:13297: result: no" >&5
+                echo "$as_me:13845: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 # look for field 'ut_tv' in header 'utmpx.h'
                ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'`
                ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv
-        echo "$as_me:13304: checking for ut_tv field in utmpx.h" >&5
+        echo "$as_me:13852: checking for ut_tv field in utmpx.h" >&5
 echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6
        if eval "test \"\${$ossh_varname+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
                cat >conftest.$ac_ext <<_ACEOF
-#line 13311 "configure"
+#line 13859 "configure"
 #include "confdefs.h"
 #include <utmpx.h>
@@ -13325,7 +13873,7 @@ fi
        ossh_result=`eval 'echo $'"$ossh_varname"`
        if test -n "`echo $ossh_varname`"; then
-                echo "$as_me:13328: result: $ossh_result" >&5
+                echo "$as_me:13876: result: $ossh_result" >&5
 echo "${ECHO_T}$ossh_result" >&6
                if test "x$ossh_result" = "xyes"; then
                        cat >>confdefs.h <<\EOF
@@ -13334,17 +13882,17 @@ EOF
                fi
        else
-                echo "$as_me:13337: result: no" >&5
+                echo "$as_me:13885: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
-echo "$as_me:13341: checking for struct stat.st_blksize" >&5
+echo "$as_me:13889: checking for struct stat.st_blksize" >&5
 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 13347 "configure"
+#line 13895 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -13358,16 +13906,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13909: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13364: \$? = $ac_status" >&5
+  echo "$as_me:13912: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13915: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13370: \$? = $ac_status" >&5
+  echo "$as_me:13918: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_member_struct_stat_st_blksize=yes
 else
@@ -13377,7 +13925,7 @@ ac_cv_member_struct_stat_st_blksize=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13380: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:13928: result: $ac_cv_member_struct_stat_st_blksize" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
 if test $ac_cv_member_struct_stat_st_blksize = yes; then
@@ -13387,14 +13935,14 @@ EOF
 fi
-echo "$as_me:13390: checking for ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:13938: checking for ss_family field in struct sockaddr_storage" >&5
 echo $ECHO_N "checking for ss_family field in struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have_ss_family_in_struct_ss+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13397 "configure"
+#line 13945 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13409,16 +13957,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13960: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13415: \$? = $ac_status" >&5
+  echo "$as_me:13963: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13966: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13421: \$? = $ac_status" >&5
+  echo "$as_me:13969: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_ss_family_in_struct_ss="yes"
 else
@@ -13429,7 +13977,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13432: result: $ac_cv_have_ss_family_in_struct_ss" >&5
+echo "$as_me:13980: result: $ac_cv_have_ss_family_in_struct_ss" >&5
 echo "${ECHO_T}$ac_cv_have_ss_family_in_struct_ss" >&6
 if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13438,14 +13986,14 @@ EOF
 fi
-echo "$as_me:13441: checking for __ss_family field in struct sockaddr_storage" >&5
+echo "$as_me:13989: checking for __ss_family field in struct sockaddr_storage" >&5
 echo $ECHO_N "checking for __ss_family field in struct sockaddr_storage... $ECHO_C" >&6
 if test "${ac_cv_have___ss_family_in_struct_ss+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13448 "configure"
+#line 13996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13460,16 +14008,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13466: \$? = $ac_status" >&5
+  echo "$as_me:14014: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14017: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13472: \$? = $ac_status" >&5
+  echo "$as_me:14020: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have___ss_family_in_struct_ss="yes"
 else
@@ -13481,7 +14029,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13484: result: $ac_cv_have___ss_family_in_struct_ss" >&5
+echo "$as_me:14032: result: $ac_cv_have___ss_family_in_struct_ss" >&5
 echo "${ECHO_T}$ac_cv_have___ss_family_in_struct_ss" >&6
 if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13490,14 +14038,14 @@ EOF
 fi
-echo "$as_me:13493: checking for pw_class field in struct passwd" >&5
+echo "$as_me:14041: checking for pw_class field in struct passwd" >&5
 echo $ECHO_N "checking for pw_class field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_class_in_struct_passwd+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13500 "configure"
+#line 14048 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -13511,16 +14059,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13517: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13523: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_class_in_struct_passwd="yes"
 else
@@ -13532,7 +14080,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13535: result: $ac_cv_have_pw_class_in_struct_passwd" >&5
+echo "$as_me:14083: result: $ac_cv_have_pw_class_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_class_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13541,14 +14089,14 @@ EOF
 fi
-echo "$as_me:13544: checking for pw_expire field in struct passwd" >&5
+echo "$as_me:14092: checking for pw_expire field in struct passwd" >&5
 echo $ECHO_N "checking for pw_expire field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_expire_in_struct_passwd+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13551 "configure"
+#line 14099 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -13562,16 +14110,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14113: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13568: \$? = $ac_status" >&5
+  echo "$as_me:14116: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14119: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13574: \$? = $ac_status" >&5
+  echo "$as_me:14122: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_expire_in_struct_passwd="yes"
 else
@@ -13583,7 +14131,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13586: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5
+echo "$as_me:14134: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_expire_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13592,14 +14140,14 @@ EOF
 fi
-echo "$as_me:13595: checking for pw_change field in struct passwd" >&5
+echo "$as_me:14143: checking for pw_change field in struct passwd" >&5
 echo $ECHO_N "checking for pw_change field in struct passwd... $ECHO_C" >&6
 if test "${ac_cv_have_pw_change_in_struct_passwd+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13602 "configure"
+#line 14150 "configure"
 #include "confdefs.h"
 #include <pwd.h>
@@ -13613,16 +14161,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:13619: \$? = $ac_status" >&5
+  echo "$as_me:14167: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13625: \$? = $ac_status" >&5
+  echo "$as_me:14173: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_pw_change_in_struct_passwd="yes"
 else
@@ -13634,7 +14182,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:13637: result: $ac_cv_have_pw_change_in_struct_passwd" >&5
+echo "$as_me:14185: result: $ac_cv_have_pw_change_in_struct_passwd" >&5
 echo "${ECHO_T}$ac_cv_have_pw_change_in_struct_passwd" >&6
 if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13643,19 +14191,19 @@ EOF
 fi
-echo "$as_me:13646: checking for msg_accrights field in struct msghdr" >&5
+echo "$as_me:14194: checking for msg_accrights field in struct msghdr" >&5
 echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6
 if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:13653: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14201: 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 13658 "configure"
+#line 14206 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13672,15 +14220,15 @@ exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14223: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13678: \$? = $ac_status" >&5
+  echo "$as_me:14226: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14228: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13683: \$? = $ac_status" >&5
+  echo "$as_me:14231: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_accrights_in_msghdr="yes"
 else
@@ -13694,7 +14242,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:13697: result: $ac_cv_have_accrights_in_msghdr" >&5
+echo "$as_me:14245: result: $ac_cv_have_accrights_in_msghdr" >&5
 echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6
 if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13703,19 +14251,19 @@ EOF
 fi
-echo "$as_me:13706: checking for msg_control field in struct msghdr" >&5
+echo "$as_me:14254: checking for msg_control field in struct msghdr" >&5
 echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6
 if test "${ac_cv_have_control_in_msghdr+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        if test "$cross_compiling" = yes; then
-  { { echo "$as_me:13713: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:14261: 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 13718 "configure"
+#line 14266 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -13732,15 +14280,15 @@ exit(0);
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14283: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13738: \$? = $ac_status" >&5
+  echo "$as_me:14286: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14288: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13743: \$? = $ac_status" >&5
+  echo "$as_me:14291: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_control_in_msghdr="yes"
 else
@@ -13754,7 +14302,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:13757: result: $ac_cv_have_control_in_msghdr" >&5
+echo "$as_me:14305: result: $ac_cv_have_control_in_msghdr" >&5
 echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6
 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13763,14 +14311,14 @@ EOF
 fi
-echo "$as_me:13766: checking if libc defines __progname" >&5
+echo "$as_me:14314: checking if libc defines __progname" >&5
 echo $ECHO_N "checking if libc defines __progname... $ECHO_C" >&6
 if test "${ac_cv_libc_defines___progname+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13773 "configure"
+#line 14321 "configure"
 #include "confdefs.h"
 int
@@ -13782,16 +14330,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14333: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13788: \$? = $ac_status" >&5
+  echo "$as_me:14336: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13791: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14339: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13794: \$? = $ac_status" >&5
+  echo "$as_me:14342: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines___progname="yes"
 else
@@ -13803,7 +14351,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13806: result: $ac_cv_libc_defines___progname" >&5
+echo "$as_me:14354: result: $ac_cv_libc_defines___progname" >&5
 echo "${ECHO_T}$ac_cv_libc_defines___progname" >&6
 if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13812,14 +14360,14 @@ EOF
 fi
-echo "$as_me:13815: checking whether $CC implements __FUNCTION__" >&5
+echo "$as_me:14363: checking whether $CC implements __FUNCTION__" >&5
 echo $ECHO_N "checking whether $CC implements __FUNCTION__... $ECHO_C" >&6
 if test "${ac_cv_cc_implements___FUNCTION__+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13822 "configure"
+#line 14370 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -13833,16 +14381,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14384: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13839: \$? = $ac_status" >&5
+  echo "$as_me:14387: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14390: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13845: \$? = $ac_status" >&5
+  echo "$as_me:14393: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_cc_implements___FUNCTION__="yes"
 else
@@ -13854,7 +14402,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13857: result: $ac_cv_cc_implements___FUNCTION__" >&5
+echo "$as_me:14405: result: $ac_cv_cc_implements___FUNCTION__" >&5
 echo "${ECHO_T}$ac_cv_cc_implements___FUNCTION__" >&6
 if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13863,14 +14411,14 @@ EOF
 fi
-echo "$as_me:13866: checking whether $CC implements __func__" >&5
+echo "$as_me:14414: checking whether $CC implements __func__" >&5
 echo $ECHO_N "checking whether $CC implements __func__... $ECHO_C" >&6
 if test "${ac_cv_cc_implements___func__+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13873 "configure"
+#line 14421 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -13884,16 +14432,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14435: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13890: \$? = $ac_status" >&5
+  echo "$as_me:14438: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14441: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13896: \$? = $ac_status" >&5
+  echo "$as_me:14444: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_cc_implements___func__="yes"
 else
@@ -13905,7 +14453,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13908: result: $ac_cv_cc_implements___func__" >&5
+echo "$as_me:14456: result: $ac_cv_cc_implements___func__" >&5
 echo "${ECHO_T}$ac_cv_cc_implements___func__" >&6
 if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13914,14 +14462,14 @@ EOF
 fi
-echo "$as_me:13917: checking whether getopt has optreset support" >&5
+echo "$as_me:14465: checking whether getopt has optreset support" >&5
 echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6
 if test "${ac_cv_have_getopt_optreset+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13924 "configure"
+#line 14472 "configure"
 #include "confdefs.h"
 #include <getopt.h>
@@ -13935,16 +14483,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14486: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13941: \$? = $ac_status" >&5
+  echo "$as_me:14489: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14492: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13947: \$? = $ac_status" >&5
+  echo "$as_me:14495: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_have_getopt_optreset="yes"
 else
@@ -13956,7 +14504,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13959: result: $ac_cv_have_getopt_optreset" >&5
+echo "$as_me:14507: result: $ac_cv_have_getopt_optreset" >&5
 echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6
 if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -13965,14 +14513,14 @@ EOF
 fi
-echo "$as_me:13968: checking if libc defines sys_errlist" >&5
+echo "$as_me:14516: checking if libc defines sys_errlist" >&5
 echo $ECHO_N "checking if libc defines sys_errlist... $ECHO_C" >&6
 if test "${ac_cv_libc_defines_sys_errlist+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 13975 "configure"
+#line 14523 "configure"
 #include "confdefs.h"
 int
@@ -13984,16 +14532,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13987: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14535: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:13990: \$? = $ac_status" >&5
+  echo "$as_me:14538: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:13996: \$? = $ac_status" >&5
+  echo "$as_me:14544: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines_sys_errlist="yes"
 else
@@ -14005,7 +14553,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14008: result: $ac_cv_libc_defines_sys_errlist" >&5
+echo "$as_me:14556: result: $ac_cv_libc_defines_sys_errlist" >&5
 echo "${ECHO_T}$ac_cv_libc_defines_sys_errlist" >&6
 if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -14014,14 +14562,14 @@ EOF
 fi
-echo "$as_me:14017: checking if libc defines sys_nerr" >&5
+echo "$as_me:14565: checking if libc defines sys_nerr" >&5
 echo $ECHO_N "checking if libc defines sys_nerr... $ECHO_C" >&6
 if test "${ac_cv_libc_defines_sys_nerr+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
        cat >conftest.$ac_ext <<_ACEOF
-#line 14024 "configure"
+#line 14572 "configure"
 #include "confdefs.h"
 int
@@ -14033,16 +14581,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14584: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14039: \$? = $ac_status" >&5
+  echo "$as_me:14587: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14590: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14045: \$? = $ac_status" >&5
+  echo "$as_me:14593: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   ac_cv_libc_defines_sys_nerr="yes"
 else
@@ -14054,7 +14602,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14057: result: $ac_cv_libc_defines_sys_nerr" >&5
+echo "$as_me:14605: result: $ac_cv_libc_defines_sys_nerr" >&5
 echo "${ECHO_T}$ac_cv_libc_defines_sys_nerr" >&6
 if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
        cat >>confdefs.h <<\EOF
@@ -14085,23 +14633,23 @@ if test "${with_sectok+set}" = set; then
 for ac_header in sectok.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14088: checking for $ac_header" >&5
+echo "$as_me:14636: 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 14094 "configure"
+#line 14642 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14098: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14646: \"$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:14104: \$? = $ac_status" >&5
+  echo "$as_me:14652: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14120,7 +14668,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14123: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14671: 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
@@ -14131,12 +14679,12 @@ fi
 done
                        if test "$ac_cv_header_sectok_h" != yes; then
-                                { { echo "$as_me:14134: error: Can't find sectok.h" >&5
+                                { { echo "$as_me:14682: error: Can't find sectok.h" >&5
 echo "$as_me: error: Can't find sectok.h" >&2;}
   { (exit 1); exit 1; }; }
                        fi
-echo "$as_me:14139: checking for sectok_open in -lsectok" >&5
+echo "$as_me:14687: checking for sectok_open in -lsectok" >&5
 echo $ECHO_N "checking for sectok_open in -lsectok... $ECHO_C" >&6
 if test "${ac_cv_lib_sectok_sectok_open+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14144,7 +14692,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsectok  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14147 "configure"
+#line 14695 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14163,16 +14711,16 @@ sectok_open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14714: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14169: \$? = $ac_status" >&5
+  echo "$as_me:14717: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14720: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14175: \$? = $ac_status" >&5
+  echo "$as_me:14723: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_sectok_sectok_open=yes
 else
@@ -14183,7 +14731,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14186: result: $ac_cv_lib_sectok_sectok_open" >&5
+echo "$as_me:14734: result: $ac_cv_lib_sectok_sectok_open" >&5
 echo "${ECHO_T}$ac_cv_lib_sectok_sectok_open" >&6
 if test $ac_cv_lib_sectok_sectok_open = yes; then
  cat >>confdefs.h <<EOF
@@ -14195,7 +14743,7 @@ EOF
 fi
                        if test "$ac_cv_lib_sectok_sectok_open" != yes; then
-                                { { echo "$as_me:14198: error: Can't find libsectok" >&5
+                                { { echo "$as_me:14746: error: Can't find libsectok" >&5
 echo "$as_me: error: Can't find libsectok" >&2;}
   { (exit 1); exit 1; }; }
                        fi
@@ -14225,7 +14773,7 @@ if test x$opensc_config_prefix != x ; then
  OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config
  # Extract the first word of "opensc-config", so it can be a program name with args.
 set dummy opensc-config; ac_word=$2
-echo "$as_me:14228: checking for $ac_word" >&5
+echo "$as_me:14776: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_OPENSC_CONFIG+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14242,7 +14790,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_OPENSC_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:14245: found $ac_dir/$ac_word" >&5
+   echo "$as_me:14793: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -14254,10 +14802,10 @@ fi
 OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG
 if test -n "$OPENSC_CONFIG"; then
-  echo "$as_me:14257: result: $OPENSC_CONFIG" >&5
+  echo "$as_me:14805: result: $OPENSC_CONFIG" >&5
 echo "${ECHO_T}$OPENSC_CONFIG" >&6
 else
-  echo "$as_me:14260: result: no" >&5
+  echo "$as_me:14808: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -14278,20 +14826,8 @@ EOF
  fi
 fi
-# Check whether user wants DNS support
+# Check libraries needed by DNS fingerprint support
-DNS_MSG="no"
+echo "$as_me:14830: checking for library containing getrrsetbyname" >&5
-# Check whether --with-dns or --without-dns was given.
-if test "${with_dns+set}" = set; then
-  withval="$with_dns"
-                if test "x$withval" != "xno" ; then
-                        DNS_MSG="yes"
-                        cat >>confdefs.h <<\EOF
-#define DNS 1
-EOF
-                        echo "$as_me:14294: checking for library containing getrrsetbyname" >&5
 echo $ECHO_N "checking for library containing getrrsetbyname... $ECHO_C" >&6
 if test "${ac_cv_search_getrrsetbyname+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14299,7 +14835,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_getrrsetbyname=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14302 "configure"
+#line 14838 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14318,16 +14854,16 @@ getrrsetbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14857: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14324: \$? = $ac_status" >&5
+  echo "$as_me:14860: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14863: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14330: \$? = $ac_status" >&5
+  echo "$as_me:14866: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_getrrsetbyname="none required"
 else
@@ -14339,7 +14875,7 @@ if test "$ac_cv_search_getrrsetbyname" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14342 "configure"
+#line 14878 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14358,16 +14894,16 @@ getrrsetbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14897: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14364: \$? = $ac_status" >&5
+  echo "$as_me:14900: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14903: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14370: \$? = $ac_status" >&5
+  echo "$as_me:14906: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_getrrsetbyname="-l$ac_lib"
 break
@@ -14380,7 +14916,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:14383: result: $ac_cv_search_getrrsetbyname" >&5
+echo "$as_me:14919: result: $ac_cv_search_getrrsetbyname" >&5
 echo "${ECHO_T}$ac_cv_search_getrrsetbyname" >&6
 if test "$ac_cv_search_getrrsetbyname" != no; then
  test "$ac_cv_search_getrrsetbyname" = "none required" || LIBS="$ac_cv_search_getrrsetbyname $LIBS"
@@ -14390,8 +14926,8 @@ EOF
 else
-                                        # Needed by our getrrsetbyname()
+                # Needed by our getrrsetbyname()
-                                        echo "$as_me:14394: checking for library containing res_query" >&5
+                echo "$as_me:14930: checking for library containing res_query" >&5
 echo $ECHO_N "checking for library containing res_query... $ECHO_C" >&6
 if test "${ac_cv_search_res_query+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14399,7 +14935,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_res_query=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14402 "configure"
+#line 14938 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14418,16 +14954,16 @@ res_query ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14957: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14424: \$? = $ac_status" >&5
+  echo "$as_me:14960: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14963: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14430: \$? = $ac_status" >&5
+  echo "$as_me:14966: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_res_query="none required"
 else
@@ -14439,7 +14975,7 @@ if test "$ac_cv_search_res_query" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14442 "configure"
+#line 14978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14458,16 +14994,16 @@ res_query ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14997: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14464: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15003: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14470: \$? = $ac_status" >&5
+  echo "$as_me:15006: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_res_query="-l$ac_lib"
 break
@@ -14480,14 +15016,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:14483: result: $ac_cv_search_res_query" >&5
+echo "$as_me:15019: result: $ac_cv_search_res_query" >&5
 echo "${ECHO_T}$ac_cv_search_res_query" >&6
 if test "$ac_cv_search_res_query" != no; then
  test "$ac_cv_search_res_query" = "none required" || LIBS="$ac_cv_search_res_query $LIBS"
 fi
-                                        echo "$as_me:14490: checking for library containing dn_expand" >&5
+                echo "$as_me:15026: checking for library containing dn_expand" >&5
 echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6
 if test "${ac_cv_search_dn_expand+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14495,7 +15031,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14498 "configure"
+#line 15034 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14514,16 +15050,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15053: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14520: \$? = $ac_status" >&5
+  echo "$as_me:15056: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15059: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14526: \$? = $ac_status" >&5
+  echo "$as_me:15062: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="none required"
 else
@@ -14535,7 +15071,7 @@ if test "$ac_cv_search_dn_expand" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14538 "configure"
+#line 15074 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14554,16 +15090,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15093: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14560: \$? = $ac_status" >&5
+  echo "$as_me:15096: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15099: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14566: \$? = $ac_status" >&5
+  echo "$as_me:15102: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -14576,7 +15112,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:14579: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15115: result: $ac_cv_search_dn_expand" >&5
 echo "${ECHO_T}$ac_cv_search_dn_expand" >&6
 if test "$ac_cv_search_dn_expand" != no; then
  test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS"
@@ -14586,13 +15122,13 @@ fi
 for ac_func in _getshort _getlong
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14589: checking for $ac_func" >&5
+echo "$as_me:15125: 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 14595 "configure"
+#line 15131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.  */
@@ -14623,16 +15159,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15162: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14629: \$? = $ac_status" >&5
+  echo "$as_me:15165: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15168: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14635: \$? = $ac_status" >&5
+  echo "$as_me:15171: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  eval "$as_ac_var=yes"
 else
@@ -14642,7 +15178,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14645: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15181: 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
@@ -14652,13 +15188,13 @@ EOF
 fi
 done
-                                        echo "$as_me:14655: checking for HEADER.ad" >&5
+                echo "$as_me:15191: checking for HEADER.ad" >&5
 echo $ECHO_N "checking for HEADER.ad... $ECHO_C" >&6
 if test "${ac_cv_member_HEADER_ad+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 14661 "configure"
+#line 15197 "configure"
 #include "confdefs.h"
 #include <arpa/nameser.h>
@@ -14673,16 +15209,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15212: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14679: \$? = $ac_status" >&5
+  echo "$as_me:15215: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15218: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14685: \$? = $ac_status" >&5
+  echo "$as_me:15221: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_member_HEADER_ad=yes
 else
@@ -14692,7 +15228,7 @@ ac_cv_member_HEADER_ad=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:14695: result: $ac_cv_member_HEADER_ad" >&5
+echo "$as_me:15231: result: $ac_cv_member_HEADER_ad" >&5
 echo "${ECHO_T}$ac_cv_member_HEADER_ad" >&6
 if test $ac_cv_member_HEADER_ad = yes; then
  cat >>confdefs.h <<\EOF
@@ -14703,34 +15239,99 @@ fi
 fi
-                fi
-fi;
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 # Check whether --with-kerberos5 or --without-kerberos5 was given.
 if test "${with_kerberos5+set}" = set; then
  withval="$with_kerberos5"
+   if test "x$withval" != "xno" ; then
+                if test "x$withval" = "xyes" ; then
+                        KRB5ROOT="/usr/local"
+                else
+                        KRB5ROOT=${withval}
+                fi
-                if test "x$withval" != "xno" ; then
+                cat >>confdefs.h <<\EOF
-                        if test "x$withval" = "xyes" ; then
-                                KRB5ROOT="/usr/local"
-                        else
-                                KRB5ROOT=${withval}
-                        fi
-                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
-                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
-                        cat >>confdefs.h <<\EOF
 #define KRB5 1
 EOF
-                        KRB5_MSG="yes"
+                KRB5_MSG="yes"
-                        echo "$as_me:14730: checking whether we are using Heimdal" >&5
+                echo "$as_me:15261: checking for krb5-config" >&5
+echo $ECHO_N "checking for krb5-config... $ECHO_C" >&6
+                if test -x  $KRB5ROOT/bin/krb5-config ; then
+                        KRB5CONF=$KRB5ROOT/bin/krb5-config
+                        echo "$as_me:15265: result: $KRB5CONF" >&5
+echo "${ECHO_T}$KRB5CONF" >&6
+                        echo "$as_me:15268: checking for gssapi support" >&5
+echo $ECHO_N "checking for gssapi support... $ECHO_C" >&6
+                        if $KRB5CONF | grep gssapi >/dev/null ; then
+                                echo "$as_me:15271: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                                cat >>confdefs.h <<\EOF
+#define GSSAPI 1
+EOF
+                                k5confopts=gssapi
+                        else
+                                echo "$as_me:15279: result: no" >&5
+echo "${ECHO_T}no" >&6
+                                k5confopts=""
+                        fi
+                        K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
+                        K5LIBS="`$KRB5CONF --libs $k5confopts`"
+                        CPPFLAGS="$CPPFLAGS $K5CFLAGS"
+                        echo "$as_me:15286: checking whether we are using Heimdal" >&5
+echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
+                        cat >conftest.$ac_ext <<_ACEOF
+#line 15289 "configure"
+#include "confdefs.h"
+ #include <krb5.h>
+int
+main ()
+{
+ char *tmp = heimdal_version;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:15301: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:15304: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:15307: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15310: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+   echo "$as_me:15312: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                                         cat >>confdefs.h <<\EOF
+#define HEIMDAL 1
+EOF
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:15321: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+                else
+                        echo "$as_me:15327: result: no" >&5
+echo "${ECHO_T}no" >&6
+                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
+                        LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
+                        echo "$as_me:15331: checking whether we are using Heimdal" >&5
 echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6
-                        cat >conftest.$ac_ext <<_ACEOF
+                        cat >conftest.$ac_ext <<_ACEOF
-#line 14733 "configure"
+#line 15334 "configure"
 #include "confdefs.h"
 #include <krb5.h>
 int
@@ -14742,41 +15343,35 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:14748: \$? = $ac_status" >&5
+  echo "$as_me:15349: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14754: \$? = $ac_status" >&5
+  echo "$as_me:15355: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:14756: result: yes" >&5
+   echo "$as_me:15357: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-                                         cat >>confdefs.h <<\EOF
+                                         cat >>confdefs.h <<\EOF
 #define HEIMDAL 1
 EOF
-                                         K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
+                                         K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:14767: result: no" >&5
+ echo "$as_me:15368: result: no" >&5
 echo "${ECHO_T}no" >&6
-                                         K5LIBS="-lkrb5 -lk5crypto -lcom_err"
+                                         K5LIBS="-lkrb5 -lk5crypto -lcom_err"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-                        if test ! -z "$need_dash_r" ; then
+                        echo "$as_me:15374: checking for library containing dn_expand" >&5
-                                LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib"
-                        fi
-                        if test ! -z "$blibpath" ; then
-                                blibpath="$blibpath:${KRB5ROOT}/lib"
-                        fi
-                        echo "$as_me:14779: checking for library containing dn_expand" >&5
 echo $ECHO_N "checking for library containing dn_expand... $ECHO_C" >&6
 if test "${ac_cv_search_dn_expand+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14784,7 +15379,7 @@ else
  ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dn_expand=no
 cat >conftest.$ac_ext <<_ACEOF
-#line 14787 "configure"
+#line 15382 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14803,16 +15398,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15401: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14809: \$? = $ac_status" >&5
+  echo "$as_me:15404: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15407: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14815: \$? = $ac_status" >&5
+  echo "$as_me:15410: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="none required"
 else
@@ -14824,7 +15419,7 @@ if test "$ac_cv_search_dn_expand" = no; then
  for ac_lib in resolv; do
    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    cat >conftest.$ac_ext <<_ACEOF
-#line 14827 "configure"
+#line 15422 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14843,16 +15438,16 @@ dn_expand ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15441: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14849: \$? = $ac_status" >&5
+  echo "$as_me:15444: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15447: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14855: \$? = $ac_status" >&5
+  echo "$as_me:15450: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_search_dn_expand="-l$ac_lib"
 break
@@ -14865,14 +15460,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:14868: result: $ac_cv_search_dn_expand" >&5
+echo "$as_me:15463: result: $ac_cv_search_dn_expand" >&5
 echo "${ECHO_T}$ac_cv_search_dn_expand" >&6
 if test "$ac_cv_search_dn_expand" != no; then
  test "$ac_cv_search_dn_expand" = "none required" || LIBS="$ac_cv_search_dn_expand $LIBS"
 fi
-                        echo "$as_me:14875: checking for gss_init_sec_context in -lgssapi" >&5
+                        echo "$as_me:15470: checking for gss_init_sec_context in -lgssapi" >&5
 echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6
 if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14880,7 +15475,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14883 "configure"
+#line 15478 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14899,16 +15494,16 @@ gss_init_sec_context ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15497: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14905: \$? = $ac_status" >&5
+  echo "$as_me:15500: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15503: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14911: \$? = $ac_status" >&5
+  echo "$as_me:15506: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gssapi_gss_init_sec_context=yes
 else
@@ -14919,7 +15514,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14922: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
+echo "$as_me:15517: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
 echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6
 if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then
   cat >>confdefs.h <<\EOF
@@ -14928,7 +15523,7 @@ EOF
                                  K5LIBS="-lgssapi $K5LIBS"
 else
-   echo "$as_me:14931: checking for gss_init_sec_context in -lgssapi_krb5" >&5
+   echo "$as_me:15526: checking for gss_init_sec_context in -lgssapi_krb5" >&5
 echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6
 if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14936,7 +15531,7 @@ else
  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14939 "configure"
+#line 15534 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14955,16 +15550,16 @@ gss_init_sec_context ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15553: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:14961: \$? = $ac_status" >&5
+  echo "$as_me:15556: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15559: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:14967: \$? = $ac_status" >&5
+  echo "$as_me:15562: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
 else
@@ -14975,38 +15570,38 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14978: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
+echo "$as_me:15573: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
 echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6
 if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then
   cat >>confdefs.h <<\EOF
 #define GSSAPI 1
 EOF
-                                          K5LIBS="-lgssapi_krb5 $K5LIBS"
+                                          K5LIBS="-lgssapi_krb5 $K5LIBS"
 else
-  { echo "$as_me:14987: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
+  { echo "$as_me:15582: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
 echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;}
 fi
 fi
-                        echo "$as_me:14993: checking for gssapi.h" >&5
+                        echo "$as_me:15588: checking for gssapi.h" >&5
 echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
 if test "${ac_cv_header_gssapi_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 14999 "configure"
+#line 15594 "configure"
 #include "confdefs.h"
 #include <gssapi.h>
 _ACEOF
-if { (eval echo "$as_me:15003: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15598: \"$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:15009: \$? = $ac_status" >&5
+  echo "$as_me:15604: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15025,7 +15620,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15028: result: $ac_cv_header_gssapi_h" >&5
+echo "$as_me:15623: result: $ac_cv_header_gssapi_h" >&5
 echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
 if test $ac_cv_header_gssapi_h = yes; then
  :
@@ -15036,23 +15631,23 @@ else
 for ac_header in gssapi.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15039: checking for $ac_header" >&5
+echo "$as_me:15634: 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 15045 "configure"
+#line 15640 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15049: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15644: \"$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:15055: \$? = $ac_status" >&5
+  echo "$as_me:15650: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15071,7 +15666,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15074: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15669: 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
@@ -15079,7 +15674,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 EOF
 else
-  { echo "$as_me:15082: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
+  { echo "$as_me:15677: WARNING: Cannot find any suitable gss-api header - build may fail" >&5
 echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;}
 fi
@@ -15089,23 +15684,23 @@ fi
                        oldCPP="$CPPFLAGS"
                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
-                        echo "$as_me:15092: checking for gssapi_krb5.h" >&5
+                        echo "$as_me:15687: checking for gssapi_krb5.h" >&5
 echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6
 if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 15098 "configure"
+#line 15693 "configure"
 #include "confdefs.h"
 #include <gssapi_krb5.h>
 _ACEOF
-if { (eval echo "$as_me:15102: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15697: \"$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:15108: \$? = $ac_status" >&5
+  echo "$as_me:15703: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15124,7 +15719,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15127: result: $ac_cv_header_gssapi_krb5_h" >&5
+echo "$as_me:15722: result: $ac_cv_header_gssapi_krb5_h" >&5
 echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6
 if test $ac_cv_header_gssapi_krb5_h = yes; then
  :
@@ -15132,11 +15727,260 @@ else
   CPPFLAGS="$oldCPP"
 fi
-                        KRB5=yes
+                fi
-                fi
+                if test ! -z "$need_dash_r" ; then
+                        LDFLAGS="$LDFLAGS -R${KRB5ROOT}/lib"
+                fi
+                if test ! -z "$blibpath" ; then
+                        blibpath="$blibpath:${KRB5ROOT}/lib"
+                fi
+        fi
+for ac_header in gssapi.h gssapi/gssapi.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:15742: 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 15748 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:15752: \"$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:15758: \$? = $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:15777: 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
+for ac_header in gssapi_krb5.h gssapi/gssapi_krb5.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:15790: 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 15796 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:15800: \"$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:15806: \$? = $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:15825: 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
+for ac_header in gssapi_generic.h gssapi/gssapi_generic.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:15838: 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 15844 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:15848: \"$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:15854: \$? = $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:15873: 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
+        LIBS="$LIBS $K5LIBS"
+        echo "$as_me:15884: checking for library containing k_hasafs" >&5
+echo $ECHO_N "checking for library containing k_hasafs... $ECHO_C" >&6
+if test "${ac_cv_search_k_hasafs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+ac_cv_search_k_hasafs=no
+cat >conftest.$ac_ext <<_ACEOF
+#line 15892 "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 k_hasafs ();
+int
+main ()
+{
+k_hasafs ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15911: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15914: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15917: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15920: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_k_hasafs="none required"
+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
+if test "$ac_cv_search_k_hasafs" = no; then
+  for ac_lib in kafs; do
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    cat >conftest.$ac_ext <<_ACEOF
+#line 15932 "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 k_hasafs ();
+int
+main ()
+{
+k_hasafs ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15951: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:15954: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:15957: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:15960: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_search_k_hasafs="-l$ac_lib"
+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
+fi
+LIBS=$ac_func_search_save_LIBS
+fi
+echo "$as_me:15973: result: $ac_cv_search_k_hasafs" >&5
+echo "${ECHO_T}$ac_cv_search_k_hasafs" >&6
+if test "$ac_cv_search_k_hasafs" != no; then
+  test "$ac_cv_search_k_hasafs" = "none required" || LIBS="$ac_cv_search_k_hasafs $LIBS"
+  cat >>confdefs.h <<\EOF
+#define USE_AFS 1
+EOF
+fi
 fi;
-LIBS="$LIBS $K5LIBS"
 # Looking for programs, paths and files
@@ -15169,7 +16013,7 @@ else
                TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin"
                # Extract the first word of "xauth", so it can be a program name with args.
 set dummy xauth; ac_word=$2
-echo "$as_me:15172: checking for $ac_word" >&5
+echo "$as_me:16016: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_xauth_path+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15186,7 +16030,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  if $as_executable_p "$ac_dir/$ac_word"; then
   ac_cv_path_xauth_path="$ac_dir/$ac_word"
-   echo "$as_me:15189: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16033: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -15197,10 +16041,10 @@ fi
 xauth_path=$ac_cv_path_xauth_path
 if test -n "$xauth_path"; then
-  echo "$as_me:15200: result: $xauth_path" >&5
+  echo "$as_me:16044: result: $xauth_path" >&5
 echo "${ECHO_T}$xauth_path" >&6
 else
-  echo "$as_me:15203: result: no" >&5
+  echo "$as_me:16047: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -15244,13 +16088,13 @@ fi
 if test -z "$no_dev_ptmx" ; then
        if test "x$disable_ptmx_check" != "xyes" ; then
-                echo "$as_me:15247: checking for \"/dev/ptmx\"" >&5
+                echo "$as_me:16091: checking for \"/dev/ptmx\"" >&5
 echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6
 if test "${ac_cv_file___dev_ptmx_+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  test "$cross_compiling" = yes &&
-  { { echo "$as_me:15253: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16097: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
   { (exit 1); exit 1; }; }
 if test -r ""/dev/ptmx""; then
@@ -15259,7 +16103,7 @@ else
  ac_cv_file___dev_ptmx_=no
 fi
 fi
-echo "$as_me:15262: result: $ac_cv_file___dev_ptmx_" >&5
+echo "$as_me:16106: result: $ac_cv_file___dev_ptmx_" >&5
 echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6
 if test $ac_cv_file___dev_ptmx_ = yes; then
@@ -15273,13 +16117,13 @@ fi
        fi
 fi
-echo "$as_me:15276: checking for \"/dev/ptc\"" >&5
+echo "$as_me:16120: checking for \"/dev/ptc\"" >&5
 echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6
 if test "${ac_cv_file___dev_ptc_+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  test "$cross_compiling" = yes &&
-  { { echo "$as_me:15282: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16126: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
   { (exit 1); exit 1; }; }
 if test -r ""/dev/ptc""; then
@@ -15288,7 +16132,7 @@ else
  ac_cv_file___dev_ptc_=no
 fi
 fi
-echo "$as_me:15291: result: $ac_cv_file___dev_ptc_" >&5
+echo "$as_me:16135: result: $ac_cv_file___dev_ptc_" >&5
 echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6
 if test $ac_cv_file___dev_ptc_ = yes; then
@@ -15311,7 +16155,7 @@ if test "${with_mantype+set}" = set; then
                        MANTYPE=$withval
                        ;;
                *)
-                        { { echo "$as_me:15314: error: invalid man type: $withval" >&5
+                        { { echo "$as_me:16158: error: invalid man type: $withval" >&5
 echo "$as_me: error: invalid man type: $withval" >&2;}
   { (exit 1); exit 1; }; }
                        ;;
@@ -15324,7 +16168,7 @@ if test -z "$MANTYPE"; 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:15327: checking for $ac_word" >&5
+echo "$as_me:16171: 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
@@ -15341,7 +16185,7 @@ for ac_dir in $ac_dummy; do
  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:15344: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16188: found $ac_dir/$ac_word" >&5
   break
 fi
 done
@@ -15352,10 +16196,10 @@ fi
 NROFF=$ac_cv_path_NROFF
 if test -n "$NROFF"; then
-  echo "$as_me:15355: result: $NROFF" >&5
+  echo "$as_me:16199: result: $NROFF" >&5
 echo "${ECHO_T}$NROFF" >&6
 else
-  echo "$as_me:15358: result: no" >&5
+  echo "$as_me:16202: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
@@ -15412,10 +16256,10 @@ EOF
 fi;
 if test -z "$disable_shadow" ; then
-        echo "$as_me:15415: checking if the systems has expire shadow information" >&5
+        echo "$as_me:16259: checking if the systems has expire shadow information" >&5
 echo $ECHO_N "checking if the systems has expire shadow information... $ECHO_C" >&6
        cat >conftest.$ac_ext <<_ACEOF
-#line 15418 "configure"
+#line 16262 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -15431,16 +16275,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16278: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15437: \$? = $ac_status" >&5
+  echo "$as_me:16281: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16284: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15443: \$? = $ac_status" >&5
+  echo "$as_me:16287: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   sp_expire_available=yes
 else
@@ -15451,14 +16295,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
        if test "x$sp_expire_available" = "xyes" ; then
-                echo "$as_me:15454: result: yes" >&5
+                echo "$as_me:16298: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                cat >>confdefs.h <<\EOF
 #define HAS_SHADOW_EXPIRE 1
 EOF
        else
-                echo "$as_me:15461: result: no" >&5
+                echo "$as_me:16305: result: no" >&5
 echo "${ECHO_T}no" >&6
        fi
 fi
@@ -15495,13 +16339,13 @@ if test "${enable_etc_default_login+set}" = set; then
 else
-echo "$as_me:15498: checking for \"/etc/default/login\"" >&5
+echo "$as_me:16342: checking for \"/etc/default/login\"" >&5
 echo $ECHO_N "checking for \"/etc/default/login\"... $ECHO_C" >&6
 if test "${ac_cv_file___etc_default_login_+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  test "$cross_compiling" = yes &&
-  { { echo "$as_me:15504: error: cannot check for file existence when cross compiling" >&5
+  { { echo "$as_me:16348: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
   { (exit 1); exit 1; }; }
 if test -r ""/etc/default/login""; then
@@ -15510,7 +16354,7 @@ else
  ac_cv_file___etc_default_login_=no
 fi
 fi
-echo "$as_me:15513: result: $ac_cv_file___etc_default_login_" >&5
+echo "$as_me:16357: result: $ac_cv_file___etc_default_login_" >&5
 echo "${ECHO_T}$ac_cv_file___etc_default_login_" >&6
 if test $ac_cv_file___etc_default_login_ = yes; then
   external_path_file=/etc/default/login
@@ -15538,7 +16382,7 @@ if test "${with_default_path+set}" = set; then
  withval="$with_default_path"
                if test "x$external_path_file" = "x/etc/login.conf" ; then
-                        { echo "$as_me:15541: WARNING:
+                        { echo "$as_me:16385: WARNING:
 --with-default-path=PATH has no effect on this system.
 Edit /etc/login.conf instead." >&5
 echo "$as_me: WARNING:
@@ -15546,7 +16390,7 @@ echo "$as_me: WARNING:
 Edit /etc/login.conf instead." >&2;}
                elif test "x$withval" != "xno" ; then
                        if test ! -z "$external_path_file" ; then
-                                { echo "$as_me:15549: WARNING:
+                                { echo "$as_me:16393: WARNING:
 --with-default-path=PATH will only be used if PATH is not defined in
 $external_path_file ." >&5
 echo "$as_me: WARNING:
@@ -15559,11 +16403,11 @@ $external_path_file ." >&2;}
 else
   if test "x$external_path_file" = "x/etc/login.conf" ; then
-                { echo "$as_me:15562: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
+                { echo "$as_me:16406: WARNING: Make sure the path to scp is in /etc/login.conf" >&5
 echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;}
        else
                if test ! -z "$external_path_file" ; then
-                        { echo "$as_me:15566: WARNING:
+                        { echo "$as_me:16410: WARNING:
 If PATH is defined in $external_path_file, ensure the path to scp is included,
 otherwise scp will not work." >&5
 echo "$as_me: WARNING:
@@ -15575,7 +16419,7 @@ otherwise scp will not work." >&2;}
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 15578 "configure"
+#line 16422 "configure"
 #include "confdefs.h"
 /* find out what STDPATH is */
@@ -15612,15 +16456,15 @@ main()
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16459: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:15618: \$? = $ac_status" >&5
+  echo "$as_me:16462: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16464: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15623: \$? = $ac_status" >&5
+  echo "$as_me:16467: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
   user_path=`cat conftest.stdpath`
 else
@@ -15644,7 +16488,7 @@ fi
                        echo $user_path | grep "^$t_bindir"  > /dev/null 2>&1
                        if test $? -ne 0  ; then
                                user_path=$user_path:$t_bindir
-                                echo "$as_me:15647: result: Adding $t_bindir to USER_PATH so scp will work" >&5
+                                echo "$as_me:16491: result: Adding $t_bindir to USER_PATH so scp will work" >&5
 echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6
                        fi
                fi
@@ -15674,7 +16518,7 @@ EOF
 fi;
-echo "$as_me:15677: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+echo "$as_me:16521: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
 echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6
 IPV4_IN6_HACK_MSG="no"
@@ -15683,7 +16527,7 @@ if test "${with_4in6+set}" = set; then
  withval="$with_4in6"
                if test "x$withval" != "xno" ; then
-                        echo "$as_me:15686: result: yes" >&5
+                        echo "$as_me:16530: result: yes" >&5
 echo "${ECHO_T}yes" >&6
                        cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -15691,14 +16535,14 @@ EOF
                        IPV4_IN6_HACK_MSG="yes"
                else
-                        echo "$as_me:15694: result: no" >&5
+                        echo "$as_me:16538: result: no" >&5
 echo "${ECHO_T}no" >&6
                fi
 else
                if test "x$inet6_default_4in6" = "xyes"; then
-                        echo "$as_me:15701: result: yes (default)" >&5
+                        echo "$as_me:16545: result: yes (default)" >&5
 echo "${ECHO_T}yes (default)" >&6
                        cat >>confdefs.h <<\EOF
 #define IPV4_IN_IPV6 1
@@ -15706,7 +16550,7 @@ EOF
                        IPV4_IN6_HACK_MSG="yes"
                else
-                        echo "$as_me:15709: result: no (default)" >&5
+                        echo "$as_me:16553: result: no (default)" >&5
 echo "${ECHO_T}no (default)" >&6
                fi
@@ -15735,7 +16579,7 @@ piddir=/var/run
 if test ! -d $piddir ; then
        piddir=`eval echo ${sysconfdir}`
        case $piddir in
-                NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
+                NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
        esac
 fi
@@ -15746,7 +16590,7 @@ if test "${with_pid_dir+set}" = set; then
                if test "x$withval" != "xno" ; then
                        piddir=$withval
                        if test ! -d $piddir ; then
-                        { echo "$as_me:15749: WARNING: ** no $piddir directory on this system **" >&5
+                        { echo "$as_me:16593: WARNING: ** no $piddir directory on this system **" >&5
 echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;}
                        fi
                fi
@@ -15869,10 +16713,10 @@ EOF
 fi;
-echo "$as_me:15872: checking if your system defines LASTLOG_FILE" >&5
+echo "$as_me:16716: checking if your system defines LASTLOG_FILE" >&5
 echo $ECHO_N "checking if your system defines LASTLOG_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15875 "configure"
+#line 16719 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -15896,29 +16740,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16743: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15902: \$? = $ac_status" >&5
+  echo "$as_me:16746: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16749: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15908: \$? = $ac_status" >&5
+  echo "$as_me:16752: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:15910: result: yes" >&5
+   echo "$as_me:16754: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                echo "$as_me:15916: result: no" >&5
+                echo "$as_me:16760: result: no" >&5
 echo "${ECHO_T}no" >&6
-                echo "$as_me:15918: checking if your system defines _PATH_LASTLOG" >&5
+                echo "$as_me:16762: checking if your system defines _PATH_LASTLOG" >&5
 echo $ECHO_N "checking if your system defines _PATH_LASTLOG... $ECHO_C" >&6
                cat >conftest.$ac_ext <<_ACEOF
-#line 15921 "configure"
+#line 16765 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -15939,24 +16783,24 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16786: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:15945: \$? = $ac_status" >&5
+  echo "$as_me:16789: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16792: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:15951: \$? = $ac_status" >&5
+  echo "$as_me:16795: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:15953: result: yes" >&5
+   echo "$as_me:16797: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-                        echo "$as_me:15959: result: no" >&5
+                        echo "$as_me:16803: result: no" >&5
 echo "${ECHO_T}no" >&6
                        system_lastlog_path=no
@@ -15974,7 +16818,7 @@ if test -z "$conf_lastlog_location"; then
                                fi
                done
                if test -z "$conf_lastlog_location"; then
-                        { echo "$as_me:15977: WARNING: ** Cannot find lastlog **" >&5
+                        { echo "$as_me:16821: WARNING: ** Cannot find lastlog **" >&5
 echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;}
                                        fi
        fi
@@ -15987,10 +16831,10 @@ EOF
 fi
-echo "$as_me:15990: checking if your system defines UTMP_FILE" >&5
+echo "$as_me:16834: checking if your system defines UTMP_FILE" >&5
 echo $ECHO_N "checking if your system defines UTMP_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15993 "configure"
+#line 16837 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16008,23 +16852,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16855: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16014: \$? = $ac_status" >&5
+  echo "$as_me:16858: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16861: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16020: \$? = $ac_status" >&5
+  echo "$as_me:16864: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16022: result: yes" >&5
+   echo "$as_me:16866: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16027: result: no" >&5
+ echo "$as_me:16871: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_utmp_path=no
@@ -16052,10 +16896,10 @@ EOF
 fi
-echo "$as_me:16055: checking if your system defines WTMP_FILE" >&5
+echo "$as_me:16899: checking if your system defines WTMP_FILE" >&5
 echo $ECHO_N "checking if your system defines WTMP_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16058 "configure"
+#line 16902 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16073,23 +16917,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16079: \$? = $ac_status" >&5
+  echo "$as_me:16923: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16926: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16085: \$? = $ac_status" >&5
+  echo "$as_me:16929: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16087: result: yes" >&5
+   echo "$as_me:16931: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16092: result: no" >&5
+ echo "$as_me:16936: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_wtmp_path=no
@@ -16117,10 +16961,10 @@ EOF
 fi
-echo "$as_me:16120: checking if your system defines UTMPX_FILE" >&5
+echo "$as_me:16964: checking if your system defines UTMPX_FILE" >&5
 echo $ECHO_N "checking if your system defines UTMPX_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16123 "configure"
+#line 16967 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16141,23 +16985,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16988: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16147: \$? = $ac_status" >&5
+  echo "$as_me:16991: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16994: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16153: \$? = $ac_status" >&5
+  echo "$as_me:16997: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16155: result: yes" >&5
+   echo "$as_me:16999: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16160: result: no" >&5
+ echo "$as_me:17004: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_utmpx_path=no
@@ -16177,10 +17021,10 @@ EOF
 fi
-echo "$as_me:16180: checking if your system defines WTMPX_FILE" >&5
+echo "$as_me:17024: checking if your system defines WTMPX_FILE" >&5
 echo $ECHO_N "checking if your system defines WTMPX_FILE... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16183 "configure"
+#line 17027 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -16201,23 +17045,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17048: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:16207: \$? = $ac_status" >&5
+  echo "$as_me:17051: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17054: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:16213: \$? = $ac_status" >&5
+  echo "$as_me:17057: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
-   echo "$as_me:16215: result: yes" >&5
+   echo "$as_me:17059: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
  echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:16220: result: no" >&5
+ echo "$as_me:17064: result: no" >&5
 echo "${ECHO_T}no" >&6
          system_wtmpx_path=no
@@ -16239,7 +17083,7 @@ fi
 if test ! -z "$blibpath" ; then
        LDFLAGS="$LDFLAGS $blibflags$blibpath"
-        { echo "$as_me:16242: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
+        { echo "$as_me:17086: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&5
 echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;}
 fi
@@ -16331,7 +17175,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:16334: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:17178: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -16504,7 +17348,7 @@ cat >>$CONFIG_STATUS <<\EOF
    echo "$ac_cs_version"; exit 0 ;;
  --he | --h)
    # Conflict between --help and --header
-    { { echo "$as_me:16507: error: ambiguous option: $1
+    { { echo "$as_me:17351: 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;}
@@ -16523,7 +17367,7 @@ Try \`$0 --help' for more information." >&2;}
    ac_need_defaults=false;;
  # This is an error.
-  -*) { { echo "$as_me:16526: error: unrecognized option: $1
+  -*) { { echo "$as_me:17370: 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;}
@@ -16563,7 +17407,7 @@ do
  "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;;
  "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;;
  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:16566: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:17410: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
   { (exit 1); exit 1; }; };;
  esac
@@ -16673,6 +17517,7 @@ s,@ENT@,$ENT,;t t
 s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t
 s,@SH@,$SH,;t t
 s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t
+s,@PATH_PASSWD_PROG@,$PATH_PASSWD_PROG,;t t
 s,@LD@,$LD,;t t
 s,@LIBWRAP@,$LIBWRAP,;t t
 s,@LIBPAM@,$LIBPAM,;t t
@@ -16819,7 +17664,7 @@ done; }
  esac
  if test x"$ac_file" != x-; then
-    { echo "$as_me:16822: creating $ac_file" >&5
+    { echo "$as_me:17667: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
@@ -16837,7 +17682,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16840: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17685: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@@ -16850,7 +17695,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:16853: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17698: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@@ -16911,7 +17756,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:16914: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:17759: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
  # First look for the input files in the build tree, otherwise in the
@@ -16922,7 +17767,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:16925: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:17770: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@@ -16935,7 +17780,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:16938: error: cannot find input file: $f" >&5
+           { { echo "$as_me:17783: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@@ -16965,7 +17810,7 @@ s/[\\&,]/\\&/g
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[    ]*#[    ]*define[       ][      ]*\(\([^        (][^    (]*\)([^)]*)\)[         ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
 t end
 s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 : end
@@ -17052,7 +17897,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:17055: $ac_file is unchanged" >&5
+      { echo "$as_me:17900: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
    else
      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -17156,7 +18001,6 @@ if test ! -z "$superuser_path" ; then
 echo "          sshd superuser user PATH: $J"
 fi
 echo "                    Manpage format: $MANTYPE"
-echo "                       DNS support: $DNS_MSG"
 echo "                       PAM support: $PAM_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                 Smartcard support: $SCARD_MSG"