snapshot of project "lynx", label v2-8-8dev_3g

8 files changed, 2781 insertions, 2878 deletions

diff --git a/CHANGES b/CHANGES
index 15ca28ec..1ffb756b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,13 @@
--- $LynxId: CHANGES,v 1.482 2010/06/18 00:48:31 tom Exp $
+-- $LynxId: CHANGES,v 1.484 2010/06/19 11:14:10 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2010-06-17 (2.8.8dev.4)
-* limit parsed URIs with new config parameter MAX_URI_SIZE, default 8192, from
-  RedHat bug report forwarded by Vincent Danen.  For arbitrarily long URIs,
+* fix typo in users's guide -PBM
+* drop mkdirs.sh and MKINSTALLDIRS symbol from makefiles, using "mkdir -p" -TD
+* limit parsed URIs with new config parameter MAX_URI_SIZE, default 8192
+  (RedHat #605286, forwarded by Vincent Danen). For arbitrarily long URIs,
   alloca() could run out of stack space -TD
 * several changes to configure script, from ongoing work on xterm, etc -TD
   + workaround for broken ".pc" file for X Toolkit, which omits the ICE
diff --git a/aclocal.m4 b/aclocal.m4
index 958af20e..75eb6563 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.160 2010/06/16 21:05:42 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.161 2010/06/19 11:04:07 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/1/28
-dnl Updated: 2010/6/16
+dnl Updated: 2010/6/19
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
@@ -38,7 +38,7 @@ dnl are modified), and are part of this file due to mechanical limitations of
 dnl autoconf.
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40
+dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
 dnl --------------
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
@@ -99,25 +99,6 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate it.
-   dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21
-   dnl added check for separate locations of scripts -mirabile 2004-Jan-18
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
-   fi
-   if test -n "$GNUSYSTEM_AUX_DIR" ; then
-     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
-       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
-     fi
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
    dnl Enable libtool support if the surrounding package wishes it.
    INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
diff --git a/configure b/configure
index a13f46b9..c5790fa5 100755
--- a/configure
+++ b/configure
@@ -8292,19 +8292,6 @@ echo "${ECHO_T}$LINGUAS" >&6
      fi
    fi
 
-                  MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh"
-   fi
-   if test -n "$GNUSYSTEM_AUX_DIR" ; then
-     if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then
-       MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs"
-     fi
-   fi
-
       INTL_LIBTOOL_SUFFIX_PREFIX=
 
 INTLDIR_MAKE=
@@ -8316,7 +8303,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8319: checking if we should use included message-library" >&5
+echo "$as_me:8306: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -8327,7 +8314,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8330: result: $use_our_messages" >&5
+echo "$as_me:8317: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8368,23 +8355,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8371: checking for $ac_header" >&5
+echo "$as_me:8358: 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 8377 "configure"
+#line 8364 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8381: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8368: \"$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:8387: \$? = $ac_status" >&5
+  echo "$as_me:8374: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8403,7 +8390,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8406: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8393: 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
@@ -8486,7 +8473,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8489: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8476: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8495,7 +8482,7 @@ esac
 fi
 NLS_DATADIR="$withval"
 
-echo "$as_me:8498: checking if you want full utility pathnames" >&5
+echo "$as_me:8485: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -8512,13 +8499,13 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:8515: result: $with_full_paths" >&5
+echo "$as_me:8502: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no && cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:8521: checking for system mailer" >&5
+echo "$as_me:8508: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8538,13 +8525,13 @@ else
 
 fi
 
-echo "$as_me:8541: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8528: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:8547: checking system mail flags" >&5
+echo "$as_me:8534: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8560,7 +8547,7 @@ else
 
 fi
 
-echo "$as_me:8563: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8550: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags"
@@ -8605,14 +8592,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:8608: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8595: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8615 "configure"
+#line 8602 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8627,16 +8614,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8617: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8633: \$? = $ac_status" >&5
+  echo "$as_me:8620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8639: \$? = $ac_status" >&5
+  echo "$as_me:8626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8645,7 +8632,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8648 "configure"
+#line 8635 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8660,16 +8647,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8666: \$? = $ac_status" >&5
+  echo "$as_me:8653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8672: \$? = $ac_status" >&5
+  echo "$as_me:8659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8684,7 +8671,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8687: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8674: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -8714,14 +8701,14 @@ solaris2.[1-9]) #(vi
 	cf_xopen_source="-D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:8717: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:8704: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8724 "configure"
+#line 8711 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8736,16 +8723,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8742: \$? = $ac_status" >&5
+  echo "$as_me:8729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8748: \$? = $ac_status" >&5
+  echo "$as_me:8735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8754,7 +8741,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8757 "configure"
+#line 8744 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8769,16 +8756,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8775: \$? = $ac_status" >&5
+  echo "$as_me:8762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8781: \$? = $ac_status" >&5
+  echo "$as_me:8768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8793,7 +8780,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8796: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8783: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -8900,16 +8887,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:8903: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8890: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me-configure}:8909: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:8896: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8912 "configure"
+#line 8899 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8924,16 +8911,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8930: \$? = $ac_status" >&5
+  echo "$as_me:8917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8936: \$? = $ac_status" >&5
+  echo "$as_me:8923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8954,7 +8941,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8957 "configure"
+#line 8944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8969,16 +8956,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8975: \$? = $ac_status" >&5
+  echo "$as_me:8962: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8981: \$? = $ac_status" >&5
+  echo "$as_me:8968: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8989,15 +8976,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:8992: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:8979: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me-configure}:8997: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:8984: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9000 "configure"
+#line 8987 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9012,16 +8999,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9018: \$? = $ac_status" >&5
+  echo "$as_me:9005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9024: \$? = $ac_status" >&5
+  echo "$as_me:9011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9037,7 +9024,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9040: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9027: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -9209,14 +9196,14 @@ fi
 
 fi
 
-echo "$as_me:9212: checking if SIGWINCH is defined" >&5
+echo "$as_me:9199: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9219 "configure"
+#line 9206 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9231,23 +9218,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9237: \$? = $ac_status" >&5
+  echo "$as_me:9224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9243: \$? = $ac_status" >&5
+  echo "$as_me:9230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 9250 "configure"
+#line 9237 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -9265,16 +9252,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9271: \$? = $ac_status" >&5
+  echo "$as_me:9258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9277: \$? = $ac_status" >&5
+  echo "$as_me:9264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -9288,11 +9275,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9291: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:9278: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:9295: checking for actual SIGWINCH definition" >&5
+echo "$as_me:9282: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9303,7 +9290,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9306 "configure"
+#line 9293 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -9325,16 +9312,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9331: \$? = $ac_status" >&5
+  echo "$as_me:9318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9337: \$? = $ac_status" >&5
+  echo "$as_me:9324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -9348,7 +9335,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:9351: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:9338: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -9360,7 +9347,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:9363: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:9350: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -9431,7 +9418,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:9434: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:9421: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -9439,7 +9426,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:9442: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:9429: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -9447,14 +9434,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:9450: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:9437: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 9457 "configure"
+#line 9444 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9466,16 +9453,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9472: \$? = $ac_status" >&5
+  echo "$as_me:9459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9478: \$? = $ac_status" >&5
+  echo "$as_me:9465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9483,12 +9470,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:9486: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:9473: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:9491: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:9478: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -9500,7 +9487,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:9503: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:9490: checking if you want NSS compatible SSL libraries" >&5
 echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
 if test "${cf_cv_use_libnss_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9515,10 +9502,10 @@ else
 fi;
 
 fi
-echo "$as_me:9518: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:9505: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:9521: checking if you want ssl library" >&5
+echo "$as_me:9508: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9533,10 +9520,10 @@ else
 fi;
 
 fi
-echo "$as_me:9536: result: $cf_cv_use_libssl" >&5
+echo "$as_me:9523: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:9539: checking if you want gnutls support" >&5
+echo "$as_me:9526: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9551,11 +9538,11 @@ else
 fi;
 
 fi
-echo "$as_me:9554: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:9541: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:9558: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:9545: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9570,10 +9557,10 @@ else
 fi;
 
 fi
-echo "$as_me:9573: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:9560: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:9576: checking if you want socks library" >&5
+echo "$as_me:9563: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9588,10 +9575,10 @@ else
 fi;
 
 fi
-echo "$as_me:9591: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:9578: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:9594: checking if you want socks5 library" >&5
+echo "$as_me:9581: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9606,7 +9593,7 @@ else
 fi;
 
 fi
-echo "$as_me:9609: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:9596: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -9645,7 +9632,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9648 "configure"
+#line 9635 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9657,16 +9644,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9663: \$? = $ac_status" >&5
+  echo "$as_me:9650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9669: \$? = $ac_status" >&5
+  echo "$as_me:9656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9683,7 +9670,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9686: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9673: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9724,7 +9711,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9727 "configure"
+#line 9714 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9736,16 +9723,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9742: \$? = $ac_status" >&5
+  echo "$as_me:9729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9748: \$? = $ac_status" >&5
+  echo "$as_me:9735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9762,7 +9749,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9765: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9752: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9778,7 +9765,7 @@ echo "${as_me-configure}:9765: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:9781: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9768: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9803,7 +9790,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9793: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9832,7 +9819,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9835: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9822: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9841,7 +9828,7 @@ echo "${as_me-configure}:9835: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:9844: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9831: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9855,12 +9842,12 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me-configure}:9858: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9845: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9863 "configure"
+#line 9850 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9876,16 +9863,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9882: \$? = $ac_status" >&5
+  echo "$as_me:9869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9888: \$? = $ac_status" >&5
+  echo "$as_me:9875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -9899,7 +9886,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9902 "configure"
+#line 9889 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9915,16 +9902,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9921: \$? = $ac_status" >&5
+  echo "$as_me:9908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9927: \$? = $ac_status" >&5
+  echo "$as_me:9914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -9941,9 +9928,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me-configure}:9944: testing find linkage for socks library ..." 1>&5
+echo "${as_me-configure}:9931: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me-configure}:9946: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9933: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10056,11 +10043,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:10059: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:10046: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
-#line 10063 "configure"
+#line 10050 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10076,21 +10063,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10082: \$? = $ac_status" >&5
+  echo "$as_me:10069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10088: \$? = $ac_status" >&5
+  echo "$as_me:10075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:10093: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:10080: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10108,7 +10095,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me-configure}:10111: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:10098: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -10205,13 +10192,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:10208: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:10195: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
             cat >conftest.$ac_ext <<_ACEOF
-#line 10214 "configure"
+#line 10201 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10227,21 +10214,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10233: \$? = $ac_status" >&5
+  echo "$as_me:10220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10239: \$? = $ac_status" >&5
+  echo "$as_me:10226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:10244: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:10231: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -10300,7 +10287,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10303 "configure"
+#line 10290 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10312,16 +10299,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10315: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10318: \$? = $ac_status" >&5
+  echo "$as_me:10305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10324: \$? = $ac_status" >&5
+  echo "$as_me:10311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10338,7 +10325,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10341: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:10328: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10372,7 +10359,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10375: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10362: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10383,7 +10370,7 @@ fi
 	LIBS="-lsocks $LIBS"
 
 else
-{ echo "$as_me:10386: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:10373: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -10425,7 +10412,7 @@ EOF
 EOF
 
   else
-    { { echo "$as_me:10428: error: cannot link with socks library" >&5
+    { { echo "$as_me:10415: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -10466,7 +10453,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10469 "configure"
+#line 10456 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10478,16 +10465,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10484: \$? = $ac_status" >&5
+  echo "$as_me:10471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10490: \$? = $ac_status" >&5
+  echo "$as_me:10477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10504,7 +10491,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10507: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:10494: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10545,7 +10532,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10548 "configure"
+#line 10535 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10557,16 +10544,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10563: \$? = $ac_status" >&5
+  echo "$as_me:10550: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10569: \$? = $ac_status" >&5
+  echo "$as_me:10556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10583,7 +10570,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10586: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:10573: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10599,7 +10586,7 @@ echo "${as_me-configure}:10586: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:10602: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:10589: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10624,7 +10611,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10627: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10614: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10653,7 +10640,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:10656: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10643: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10662,7 +10649,7 @@ echo "${as_me-configure}:10656: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:10665: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:10652: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10681,11 +10668,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:10684: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:10671: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 10688 "configure"
+#line 10675 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -10699,16 +10686,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10705: \$? = $ac_status" >&5
+  echo "$as_me:10692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10711: \$? = $ac_status" >&5
+  echo "$as_me:10698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -10719,7 +10706,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10722 "configure"
+#line 10709 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -10731,29 +10718,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10737: \$? = $ac_status" >&5
+  echo "$as_me:10724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10743: \$? = $ac_status" >&5
+  echo "$as_me:10730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:10749: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:10736: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10756: result: $cf_use_socks4" >&5
+echo "$as_me:10743: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -10808,10 +10795,10 @@ EOF
 
 fi
 
-echo "$as_me:10811: checking if socks5p.h is available" >&5
+echo "$as_me:10798: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 10814 "configure"
+#line 10801 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -10826,16 +10813,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10829: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10832: \$? = $ac_status" >&5
+  echo "$as_me:10819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10838: \$? = $ac_status" >&5
+  echo "$as_me:10825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -10844,7 +10831,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:10847: result: $cf_use_socks5p_h" >&5
+echo "$as_me:10834: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
@@ -10855,14 +10842,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:10858: checking for network libraries" >&5
+echo "$as_me:10845: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:10865: result: working..." >&5
+echo "$as_me:10852: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -10874,23 +10861,23 @@ mingw32) # (vi
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10877: checking for $ac_header" >&5
+echo "$as_me:10864: 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 10883 "configure"
+#line 10870 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10887: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10874: \"$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:10893: \$? = $ac_status" >&5
+  echo "$as_me:10880: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10909,7 +10896,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10912: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10899: 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
@@ -10929,7 +10916,7 @@ done
 	LIBS="$cf_winsock_lib $LIBS"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10932 "configure"
+#line 10919 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -10956,22 +10943,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10962: \$? = $ac_status" >&5
+  echo "$as_me:10949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10968: \$? = $ac_status" >&5
+  echo "$as_me:10955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:10974: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:10961: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10984,13 +10971,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10987: checking for $ac_func" >&5
+echo "$as_me:10974: 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 10993 "configure"
+#line 10980 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11021,16 +11008,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11027: \$? = $ac_status" >&5
+  echo "$as_me:11014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11033: \$? = $ac_status" >&5
+  echo "$as_me:11020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11040,7 +11027,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11043: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11030: 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
@@ -11049,7 +11036,7 @@ EOF
 
 else
 
-echo "$as_me:11052: checking for gethostname in -lnsl" >&5
+echo "$as_me:11039: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11057,7 +11044,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11060 "configure"
+#line 11047 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11076,16 +11063,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11082: \$? = $ac_status" >&5
+  echo "$as_me:11069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11088: \$? = $ac_status" >&5
+  echo "$as_me:11075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -11096,7 +11083,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11099: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:11086: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -11113,7 +11100,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:11116: checking for gethostname in -lsocket" >&5
+echo "$as_me:11103: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11121,7 +11108,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11124 "configure"
+#line 11111 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11140,16 +11127,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11130: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11146: \$? = $ac_status" >&5
+  echo "$as_me:11133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11152: \$? = $ac_status" >&5
+  echo "$as_me:11139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -11160,7 +11147,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11163: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:11150: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -11184,7 +11171,7 @@ fi
 fi
 done
 
-	echo "$as_me:11187: checking for main in -linet" >&5
+	echo "$as_me:11174: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11192,7 +11179,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11195 "configure"
+#line 11182 "configure"
 #include "confdefs.h"
 
 int
@@ -11204,16 +11191,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11210: \$? = $ac_status" >&5
+  echo "$as_me:11197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11216: \$? = $ac_status" >&5
+  echo "$as_me:11203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -11224,7 +11211,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11227: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:11214: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -11235,13 +11222,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11238: checking for $ac_func" >&5
+echo "$as_me:11225: 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 11244 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11272,16 +11259,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11278: \$? = $ac_status" >&5
+  echo "$as_me:11265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11284: \$? = $ac_status" >&5
+  echo "$as_me:11271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11291,7 +11278,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11294: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11281: 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
@@ -11300,7 +11287,7 @@ EOF
 
 else
 
-echo "$as_me:11303: checking for socket in -lsocket" >&5
+echo "$as_me:11290: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11308,7 +11295,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11311 "configure"
+#line 11298 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11327,16 +11314,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11333: \$? = $ac_status" >&5
+  echo "$as_me:11320: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11339: \$? = $ac_status" >&5
+  echo "$as_me:11326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -11347,7 +11334,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11350: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:11337: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -11364,7 +11351,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:11367: checking for socket in -lbsd" >&5
+echo "$as_me:11354: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11372,7 +11359,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11375 "configure"
+#line 11362 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11391,16 +11378,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11381: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11397: \$? = $ac_status" >&5
+  echo "$as_me:11384: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11403: \$? = $ac_status" >&5
+  echo "$as_me:11390: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -11411,7 +11398,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11414: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:11401: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -11440,13 +11427,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11443: checking for $ac_func" >&5
+echo "$as_me:11430: 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 11449 "configure"
+#line 11436 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11477,16 +11464,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11480: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11483: \$? = $ac_status" >&5
+  echo "$as_me:11470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11489: \$? = $ac_status" >&5
+  echo "$as_me:11476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11496,7 +11483,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11499: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11486: 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
@@ -11505,7 +11492,7 @@ EOF
 
 else
 
-echo "$as_me:11508: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:11495: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11513,7 +11500,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11516 "configure"
+#line 11503 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11532,16 +11519,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11538: \$? = $ac_status" >&5
+  echo "$as_me:11525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11544: \$? = $ac_status" >&5
+  echo "$as_me:11531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -11552,7 +11539,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11555: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:11542: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
 
@@ -11577,13 +11564,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11580: checking for $ac_func" >&5
+echo "$as_me:11567: 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 11586 "configure"
+#line 11573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11614,16 +11601,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11604: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11620: \$? = $ac_status" >&5
+  echo "$as_me:11607: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11626: \$? = $ac_status" >&5
+  echo "$as_me:11613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11633,7 +11620,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11636: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11623: 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
@@ -11642,7 +11629,7 @@ EOF
 
 else
 
-echo "$as_me:11645: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:11632: checking for gethostbyname in -lnetwork" >&5
 echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
 if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11650,7 +11637,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11653 "configure"
+#line 11640 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11669,16 +11656,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11675: \$? = $ac_status" >&5
+  echo "$as_me:11662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11681: \$? = $ac_status" >&5
+  echo "$as_me:11668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -11689,7 +11676,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11692: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:11679: result: $ac_cv_lib_network_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
 if test $ac_cv_lib_network_gethostbyname = yes; then
 
@@ -11714,13 +11701,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11717: checking for $ac_func" >&5
+echo "$as_me:11704: 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 11723 "configure"
+#line 11710 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11751,16 +11738,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11757: \$? = $ac_status" >&5
+  echo "$as_me:11744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11763: \$? = $ac_status" >&5
+  echo "$as_me:11750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11770,7 +11757,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11773: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11760: 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
@@ -11779,7 +11766,7 @@ EOF
 
 else
 
-echo "$as_me:11782: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:11769: 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
@@ -11787,7 +11774,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11790 "configure"
+#line 11777 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11806,16 +11793,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11812: \$? = $ac_status" >&5
+  echo "$as_me:11799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11818: \$? = $ac_status" >&5
+  echo "$as_me:11805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -11826,7 +11813,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11829: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:11816: 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
 
@@ -11867,14 +11854,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:11870: checking for inet_aton function" >&5
+echo "$as_me:11857: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11877 "configure"
+#line 11864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11890,16 +11877,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  echo "$as_me:11883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11902: \$? = $ac_status" >&5
+  echo "$as_me:11889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -11909,7 +11896,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11912: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:11899: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
     cat >>confdefs.h <<\EOF
@@ -11917,14 +11904,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then
 EOF
 
 else
-    echo "$as_me:11920: checking for inet_addr function" >&5
+    echo "$as_me:11907: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11927 "configure"
+#line 11914 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11940,16 +11927,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11946: \$? = $ac_status" >&5
+  echo "$as_me:11933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11952: \$? = $ac_status" >&5
+  echo "$as_me:11939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -11959,10 +11946,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11962: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:11949: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:11965: checking for library with inet_addr" >&5
+	echo "$as_me:11952: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11973,7 +11960,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11976 "configure"
+#line 11963 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11989,16 +11976,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11995: \$? = $ac_status" >&5
+  echo "$as_me:11982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12001: \$? = $ac_status" >&5
+  echo "$as_me:11988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -12012,18 +11999,18 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:12015: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:12002: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 	    LIBS="$LIBS $cf_cv_lib_inet_addr"
 	else
-	    { echo "$as_me:12020: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:12007: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
 fi
 
-echo "$as_me:12026: checking if you want to use pkg-config" >&5
+echo "$as_me:12013: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -12033,7 +12020,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:12036: result: $cf_pkg_config" >&5
+echo "$as_me:12023: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in #(vi
@@ -12043,7 +12030,7 @@ no) #(vi
 yes) #(vi
 	# Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:12046: checking for $ac_word" >&5
+echo "$as_me:12033: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12060,7 +12047,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_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:12063: found $ac_dir/$ac_word" >&5
+   echo "$as_me:12050: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -12072,10 +12059,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:12075: result: $PKG_CONFIG" >&5
+  echo "$as_me:12062: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:12078: result: no" >&5
+  echo "$as_me:12065: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12113,7 +12100,7 @@ case ".$PKG_CONFIG" in #(vi
   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:12116: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+  { { echo "$as_me:12103: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -12162,7 +12149,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12165 "configure"
+#line 12152 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12174,16 +12161,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12177: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12180: \$? = $ac_status" >&5
+  echo "$as_me:12167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12186: \$? = $ac_status" >&5
+  echo "$as_me:12173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12200,7 +12187,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12203: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12190: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12241,7 +12228,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12244 "configure"
+#line 12231 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12253,16 +12240,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12256: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12259: \$? = $ac_status" >&5
+  echo "$as_me:12246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12265: \$? = $ac_status" >&5
+  echo "$as_me:12252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12279,7 +12266,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12282: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12269: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12295,7 +12282,7 @@ echo "${as_me-configure}:12282: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:12298: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:12285: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -12320,7 +12307,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12323: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12310: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12349,7 +12336,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12352: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12339: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12358,7 +12345,7 @@ echo "${as_me-configure}:12352: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:12361: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:12348: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -12489,7 +12476,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:12492: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:12479: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
@@ -12510,7 +12497,7 @@ echo "${as_me-configure}:12492: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 			*-ldl) #(vi
 				;;
 			*)
-				echo "$as_me:12513: checking for dlsym in -ldl" >&5
+				echo "$as_me:12500: 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
@@ -12518,7 +12505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12521 "configure"
+#line 12508 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12537,16 +12524,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12540: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12543: \$? = $ac_status" >&5
+  echo "$as_me:12530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12549: \$? = $ac_status" >&5
+  echo "$as_me:12536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -12557,7 +12544,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12560: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:12547: 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
   cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -12573,12 +12560,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:12576: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:12563: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12581 "configure"
+#line 12568 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12607,16 +12594,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12613: \$? = $ac_status" >&5
+  echo "$as_me:12600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12619: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -12630,7 +12617,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12633 "configure"
+#line 12620 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12659,16 +12646,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12649: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12665: \$? = $ac_status" >&5
+  echo "$as_me:12652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12671: \$? = $ac_status" >&5
+  echo "$as_me:12658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -12685,9 +12672,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me-configure}:12688: testing find linkage for ssl library ..." 1>&5
+echo "${as_me-configure}:12675: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me-configure}:12690: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:12677: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12800,11 +12787,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:12803: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:12790: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12807 "configure"
+#line 12794 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12833,21 +12820,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12839: \$? = $ac_status" >&5
+  echo "$as_me:12826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12845: \$? = $ac_status" >&5
+  echo "$as_me:12832: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:12850: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:12837: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12865,7 +12852,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:12868: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:12855: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -12873,7 +12860,7 @@ echo "${as_me-configure}:12868: testing Searching for ssl library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12876 "configure"
+#line 12863 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12902,21 +12889,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12892: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12908: \$? = $ac_status" >&5
+  echo "$as_me:12895: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12914: \$? = $ac_status" >&5
+  echo "$as_me:12901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:12919: testing ... found ssl library in system ..." 1>&5
+echo "${as_me-configure}:12906: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -13019,13 +13006,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:13022: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:13009: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 13028 "configure"
+#line 13015 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13054,21 +13041,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13057: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13060: \$? = $ac_status" >&5
+  echo "$as_me:13047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13066: \$? = $ac_status" >&5
+  echo "$as_me:13053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:13071: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:13058: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -13130,7 +13117,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13133: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13120: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13170,7 +13157,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13173 "configure"
+#line 13160 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13182,16 +13169,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13188: \$? = $ac_status" >&5
+  echo "$as_me:13175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13194: \$? = $ac_status" >&5
+  echo "$as_me:13181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13208,7 +13195,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13211: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13198: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13246,10 +13233,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:13249: checking for X509 support" >&5
+echo "$as_me:13236: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13252 "configure"
+#line 13239 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13273,16 +13260,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13279: \$? = $ac_status" >&5
+  echo "$as_me:13266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13285: \$? = $ac_status" >&5
+  echo "$as_me:13272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -13291,7 +13278,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:13294: result: $cf_x509_support" >&5
+echo "$as_me:13281: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -13343,7 +13330,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13346 "configure"
+#line 13333 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13355,16 +13342,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13361: \$? = $ac_status" >&5
+  echo "$as_me:13348: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13367: \$? = $ac_status" >&5
+  echo "$as_me:13354: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13381,7 +13368,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13384: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13371: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13422,7 +13409,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13425 "configure"
+#line 13412 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13434,16 +13421,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13440: \$? = $ac_status" >&5
+  echo "$as_me:13427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13446: \$? = $ac_status" >&5
+  echo "$as_me:13433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13460,7 +13447,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13463: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13450: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13476,7 +13463,7 @@ echo "${as_me-configure}:13463: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:13479: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13466: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13501,7 +13488,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13504: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13491: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13530,7 +13517,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13533: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13520: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13539,7 +13526,7 @@ echo "${as_me-configure}:13533: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:13542: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13529: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13557,12 +13544,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:13560: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me-configure}:13547: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13565: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:13552: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -13674,14 +13661,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:13677: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:13664: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13684: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:13671: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -13701,12 +13688,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:13704: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13691: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13709 "configure"
+#line 13696 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13735,16 +13722,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13741: \$? = $ac_status" >&5
+  echo "$as_me:13728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13747: \$? = $ac_status" >&5
+  echo "$as_me:13734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -13758,7 +13745,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13761 "configure"
+#line 13748 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13787,16 +13774,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13793: \$? = $ac_status" >&5
+  echo "$as_me:13780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13799: \$? = $ac_status" >&5
+  echo "$as_me:13786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -13813,9 +13800,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:13816: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me-configure}:13803: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:13818: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13805: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13928,11 +13915,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13931: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13918: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 13935 "configure"
+#line 13922 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13961,21 +13948,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13967: \$? = $ac_status" >&5
+  echo "$as_me:13954: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13973: \$? = $ac_status" >&5
+  echo "$as_me:13960: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13978: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13965: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13993,7 +13980,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:13996: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13983: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14090,13 +14077,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14093: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14080: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 14099 "configure"
+#line 14086 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14125,21 +14112,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14131: \$? = $ac_status" >&5
+  echo "$as_me:14118: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14137: \$? = $ac_status" >&5
+  echo "$as_me:14124: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14142: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14129: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -14217,7 +14204,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14220 "configure"
+#line 14207 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14229,16 +14216,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14235: \$? = $ac_status" >&5
+  echo "$as_me:14222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14241: \$? = $ac_status" >&5
+  echo "$as_me:14228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14255,7 +14242,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14258: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14245: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14294,7 +14281,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14297: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14284: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14313,10 +14300,10 @@ EOF
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:14316: checking for X509 support" >&5
+echo "$as_me:14303: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14319 "configure"
+#line 14306 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14340,16 +14327,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14346: \$? = $ac_status" >&5
+  echo "$as_me:14333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14352: \$? = $ac_status" >&5
+  echo "$as_me:14339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14358,7 +14345,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14361: result: $cf_x509_support" >&5
+echo "$as_me:14348: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14409,7 +14396,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14412 "configure"
+#line 14399 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14421,16 +14408,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14427: \$? = $ac_status" >&5
+  echo "$as_me:14414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14433: \$? = $ac_status" >&5
+  echo "$as_me:14420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14447,7 +14434,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14450: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14437: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14488,7 +14475,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14491 "configure"
+#line 14478 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14500,16 +14487,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14506: \$? = $ac_status" >&5
+  echo "$as_me:14493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14512: \$? = $ac_status" >&5
+  echo "$as_me:14499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14526,7 +14513,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14529: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14516: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14542,7 +14529,7 @@ echo "${as_me-configure}:14529: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:14545: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14532: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14567,7 +14554,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14570: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14557: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14596,7 +14583,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14599: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14586: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14605,7 +14592,7 @@ echo "${as_me-configure}:14599: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:14608: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14595: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -14623,12 +14610,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:14626: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me-configure}:14613: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:14631: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:14618: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -14740,14 +14727,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:14743: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:14730: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:14750: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:14737: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -14767,12 +14754,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:14770: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:14757: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14775 "configure"
+#line 14762 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14801,16 +14788,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14791: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14807: \$? = $ac_status" >&5
+  echo "$as_me:14794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14813: \$? = $ac_status" >&5
+  echo "$as_me:14800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -14824,7 +14811,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14827 "configure"
+#line 14814 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14853,16 +14840,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14859: \$? = $ac_status" >&5
+  echo "$as_me:14846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14865: \$? = $ac_status" >&5
+  echo "$as_me:14852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -14879,9 +14866,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:14882: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me-configure}:14869: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:14884: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:14871: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14994,11 +14981,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14997: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14984: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 15001 "configure"
+#line 14988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15027,21 +15014,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15033: \$? = $ac_status" >&5
+  echo "$as_me:15020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15039: \$? = $ac_status" >&5
+  echo "$as_me:15026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15044: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:15031: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15059,7 +15046,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:15062: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:15049: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -15156,13 +15143,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15159: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:15146: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15165 "configure"
+#line 15152 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15191,21 +15178,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15194: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15181: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15197: \$? = $ac_status" >&5
+  echo "$as_me:15184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15203: \$? = $ac_status" >&5
+  echo "$as_me:15190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:15208: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:15195: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -15283,7 +15270,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15286 "configure"
+#line 15273 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15295,16 +15282,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15285: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15301: \$? = $ac_status" >&5
+  echo "$as_me:15288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15307: \$? = $ac_status" >&5
+  echo "$as_me:15294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15321,7 +15308,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:15324: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:15311: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15360,7 +15347,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:15363: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:15350: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15378,7 +15365,7 @@ EOF
 		fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:15381: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:15368: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15386,7 +15373,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15389 "configure"
+#line 15376 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15405,16 +15392,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15411: \$? = $ac_status" >&5
+  echo "$as_me:15398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15414: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15417: \$? = $ac_status" >&5
+  echo "$as_me:15404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -15425,12 +15412,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15428: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:15415: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:15433: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:15420: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15438,7 +15425,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15441 "configure"
+#line 15428 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15457,16 +15444,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15463: \$? = $ac_status" >&5
+  echo "$as_me:15450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15469: \$? = $ac_status" >&5
+  echo "$as_me:15456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -15477,12 +15464,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15480: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:15467: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:15485: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:15472: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15491,10 +15478,10 @@ fi
 
 			fi
 
-echo "$as_me:15494: checking for X509 support" >&5
+echo "$as_me:15481: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15497 "configure"
+#line 15484 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15518,16 +15505,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15524: \$? = $ac_status" >&5
+  echo "$as_me:15511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15530: \$? = $ac_status" >&5
+  echo "$as_me:15517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15536,7 +15523,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15539: result: $cf_x509_support" >&5
+echo "$as_me:15526: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15568,7 +15555,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:15571: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:15558: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15576,7 +15563,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15579 "configure"
+#line 15566 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15595,16 +15582,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15598: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15601: \$? = $ac_status" >&5
+  echo "$as_me:15588: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15604: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15607: \$? = $ac_status" >&5
+  echo "$as_me:15594: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -15615,7 +15602,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15618: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:15605: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -15630,11 +15617,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me-configure}:15633: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me-configure}:15620: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:15637: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:15624: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -15649,13 +15636,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:15652: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:15639: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:15658: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:15645: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -15749,10 +15736,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:15752: checking for NSS compilant include directory" >&5
+echo "$as_me:15739: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15755 "configure"
+#line 15742 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15766,16 +15753,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15772: \$? = $ac_status" >&5
+  echo "$as_me:15759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15778: \$? = $ac_status" >&5
+  echo "$as_me:15765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -15784,7 +15771,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:15787: result: $cf_ssl_incl" >&5
+echo "$as_me:15774: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
@@ -15792,10 +15779,10 @@ EOF
 
 fi
 
-echo "$as_me:15795: checking if we can link to NSS compilant library" >&5
+echo "$as_me:15782: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15798 "configure"
+#line 15785 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15814,16 +15801,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15820: \$? = $ac_status" >&5
+  echo "$as_me:15807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15826: \$? = $ac_status" >&5
+  echo "$as_me:15813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -15832,7 +15819,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15835: result: $cf_ssl_library" >&5
+echo "$as_me:15822: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -15844,7 +15831,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:15847: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:15834: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15852,7 +15839,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:15855: checking whether to enable ipv6" >&5
+echo "$as_me:15842: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -15868,11 +15855,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:15871: result: $enableval" >&5
+echo "$as_me:15858: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:15875: checking ipv6 stack type" >&5
+echo "$as_me:15862: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15893,7 +15880,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15896 "configure"
+#line 15883 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -15910,7 +15897,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15913 "configure"
+#line 15900 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -15927,7 +15914,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15930 "configure"
+#line 15917 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -15953,7 +15940,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15956 "configure"
+#line 15943 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -15970,7 +15957,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15973 "configure"
+#line 15960 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -15987,7 +15974,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15990 "configure"
+#line 15977 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -16009,13 +15996,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:16012: result: $cf_cv_ipv6type" >&5
+echo "$as_me:15999: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:16018: checking for IPv6 library if required" >&5
+echo "$as_me:16005: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -16045,13 +16032,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:16048: result: $cf_ipv6lib" >&5
+echo "$as_me:16035: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16054 "configure"
+#line 16041 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16067,16 +16054,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16073: \$? = $ac_status" >&5
+  echo "$as_me:16060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16076: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16079: \$? = $ac_status" >&5
+  echo "$as_me:16066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16216,7 +16203,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16219 "configure"
+#line 16206 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16228,16 +16215,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16234: \$? = $ac_status" >&5
+  echo "$as_me:16221: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16240: \$? = $ac_status" >&5
+  echo "$as_me:16227: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16254,7 +16241,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:16257: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16244: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16280,13 +16267,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:16283: checking for getaddrinfo" >&5
+	echo "$as_me:16270: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16289 "configure"
+#line 16276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -16317,16 +16304,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16323: \$? = $ac_status" >&5
+  echo "$as_me:16310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16329: \$? = $ac_status" >&5
+  echo "$as_me:16316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -16336,18 +16323,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16339: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:16326: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:16346: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:16333: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 16350 "configure"
+#line 16337 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16363,25 +16350,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16369: \$? = $ac_status" >&5
+  echo "$as_me:16356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16375: \$? = $ac_status" >&5
+  echo "$as_me:16362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16377: result: yes" >&5
+  echo "$as_me:16364: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16384: result: no" >&5
+echo "$as_me:16371: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -16471,11 +16458,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:16474: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:16461: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 16478 "configure"
+#line 16465 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16491,25 +16478,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16497: \$? = $ac_status" >&5
+  echo "$as_me:16484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16503: \$? = $ac_status" >&5
+  echo "$as_me:16490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16505: result: yes" >&5
+  echo "$as_me:16492: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16512: result: no" >&5
+echo "$as_me:16499: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -16524,7 +16511,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:16527: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:16514: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -16532,7 +16519,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:16535: checking working getaddrinfo" >&5
+echo "$as_me:16522: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16542,7 +16529,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16545 "configure"
+#line 16532 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -16622,15 +16609,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16612: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:16615: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16633: \$? = $ac_status" >&5
+  echo "$as_me:16620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -16643,7 +16630,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:16646: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:16633: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -16658,12 +16645,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:16661: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:16648: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:16666: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:16653: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -16674,7 +16661,7 @@ fi
 
 fi
 
-echo "$as_me:16677: checking for screen type" >&5
+echo "$as_me:16664: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16688,7 +16675,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:16691: error: Unexpected value" >&5
+*)	{ { echo "$as_me:16678: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -16697,7 +16684,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:16700: result: $cf_cv_screen" >&5
+echo "$as_me:16687: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -16732,7 +16719,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:16735: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:16722: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -16751,7 +16738,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:16754: checking for extra include directories" >&5
+echo "$as_me:16741: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16771,11 +16758,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:16774: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:16761: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:16778: checking if we have identified curses headers" >&5
+echo "$as_me:16765: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16787,7 +16774,7 @@ for cf_header in  \
 	ncurses.h ncurses/curses.h ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16790 "configure"
+#line 16777 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -16799,16 +16786,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16789: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16805: \$? = $ac_status" >&5
+  echo "$as_me:16792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16811: \$? = $ac_status" >&5
+  echo "$as_me:16798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -16819,11 +16806,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16822: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:16809: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:16826: error: No curses header-files found" >&5
+	{ { echo "$as_me:16813: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16833,23 +16820,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:16836: checking for $ac_header" >&5
+echo "$as_me:16823: 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 16842 "configure"
+#line 16829 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:16846: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16833: \"$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:16852: \$? = $ac_status" >&5
+  echo "$as_me:16839: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16868,7 +16855,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:16871: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:16858: 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
@@ -16878,7 +16865,7 @@ EOF
 fi
 done
 
-echo "$as_me:16881: checking for terminfo header" >&5
+echo "$as_me:16868: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16896,7 +16883,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16899 "configure"
+#line 16886 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16911,16 +16898,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16917: \$? = $ac_status" >&5
+  echo "$as_me:16904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16923: \$? = $ac_status" >&5
+  echo "$as_me:16910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -16936,7 +16923,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16939: result: $cf_cv_term_header" >&5
+echo "$as_me:16926: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -16965,7 +16952,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:16968: checking for ncurses version" >&5
+echo "$as_me:16955: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16991,10 +16978,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:16994: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:16981: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:16997: \$? = $ac_status" >&5
+  echo "$as_me:16984: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -17004,7 +16991,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17007 "configure"
+#line 16994 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17029,15 +17016,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17035: \$? = $ac_status" >&5
+  echo "$as_me:17022: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17040: \$? = $ac_status" >&5
+  echo "$as_me:17027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -17051,16 +17038,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:17054: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:17041: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:17060: checking if we have identified curses libraries" >&5
+echo "$as_me:17047: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17063 "configure"
+#line 17050 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17072,16 +17059,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17078: \$? = $ac_status" >&5
+  echo "$as_me:17065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17084: \$? = $ac_status" >&5
+  echo "$as_me:17071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17090,13 +17077,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17093: result: $cf_result" >&5
+echo "$as_me:17080: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:17099: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:17086: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17104,7 +17091,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17107 "configure"
+#line 17094 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17123,16 +17110,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17113: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17129: \$? = $ac_status" >&5
+  echo "$as_me:17116: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17135: \$? = $ac_status" >&5
+  echo "$as_me:17122: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -17143,7 +17130,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17146: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17133: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -17151,7 +17138,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:17154: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:17141: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17159,7 +17146,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17162 "configure"
+#line 17149 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17178,16 +17165,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17184: \$? = $ac_status" >&5
+  echo "$as_me:17171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17190: \$? = $ac_status" >&5
+  echo "$as_me:17177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -17198,7 +17185,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17201: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:17188: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -17207,7 +17194,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:17210: checking for initscr in -lHcurses" >&5
+    echo "$as_me:17197: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17215,7 +17202,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17218 "configure"
+#line 17205 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17234,16 +17221,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17240: \$? = $ac_status" >&5
+  echo "$as_me:17227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17246: \$? = $ac_status" >&5
+  echo "$as_me:17233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -17254,7 +17241,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17257: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:17244: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -17289,7 +17276,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17292: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:17279: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17320,7 +17307,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17323: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:17310: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17348,13 +17335,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:17351: checking for tgoto" >&5
+    echo "$as_me:17338: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17357 "configure"
+#line 17344 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -17385,16 +17372,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17391: \$? = $ac_status" >&5
+  echo "$as_me:17378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17397: \$? = $ac_status" >&5
+  echo "$as_me:17384: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -17404,7 +17391,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17407: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:17394: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -17413,7 +17400,7 @@ else
         for cf_term_lib in $cf_check_list termcap termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:17416: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:17403: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17421,7 +17408,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17424 "configure"
+#line 17411 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17440,16 +17427,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17446: \$? = $ac_status" >&5
+  echo "$as_me:17433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17452: \$? = $ac_status" >&5
+  echo "$as_me:17439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17460,7 +17447,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17463: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:17450: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -17475,7 +17462,7 @@ fi
  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:17478: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:17465: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17483,7 +17470,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17486 "configure"
+#line 17473 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17502,16 +17489,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17508: \$? = $ac_status" >&5
+  echo "$as_me:17495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17514: \$? = $ac_status" >&5
+  echo "$as_me:17501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -17522,23 +17509,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17525: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:17512: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
     done
-    test $cf_curs_lib = unknown && { { echo "$as_me:17532: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:17519: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
-        echo "$as_me:17538: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:17525: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 17541 "configure"
+#line 17528 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17550,16 +17537,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17556: \$? = $ac_status" >&5
+  echo "$as_me:17543: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17562: \$? = $ac_status" >&5
+  echo "$as_me:17549: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17568,18 +17555,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:17571: result: $cf_result" >&5
+        echo "$as_me:17558: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:17573: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:17560: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
         :
     elif test "$cf_term_lib" != predefined ; then
-        echo "$as_me:17579: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:17566: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 17582 "configure"
+#line 17569 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17591,16 +17578,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17581: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17597: \$? = $ac_status" >&5
+  echo "$as_me:17584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17603: \$? = $ac_status" >&5
+  echo "$as_me:17590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -17609,7 +17596,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 17612 "configure"
+#line 17599 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17621,16 +17608,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17627: \$? = $ac_status" >&5
+  echo "$as_me:17614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17633: \$? = $ac_status" >&5
+  echo "$as_me:17620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -17642,13 +17629,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:17645: result: $cf_result" >&5
+        echo "$as_me:17632: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:17651: checking for curses performance tradeoff" >&5
+echo "$as_me:17638: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17656,7 +17643,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 17659 "configure"
+#line 17646 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17675,20 +17662,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17665: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17681: \$? = $ac_status" >&5
+  echo "$as_me:17668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17687: \$? = $ac_status" >&5
+  echo "$as_me:17674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17691 "configure"
+#line 17678 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -17708,16 +17695,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17714: \$? = $ac_status" >&5
+  echo "$as_me:17701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17720: \$? = $ac_status" >&5
+  echo "$as_me:17707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -17732,20 +17719,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:17735: result: $cf_cv_curs_performance" >&5
+echo "$as_me:17722: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:17741: checking for curses touchline function" >&5
+echo "$as_me:17728: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17748 "configure"
+#line 17735 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17758,23 +17745,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17748: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17764: \$? = $ac_status" >&5
+  echo "$as_me:17751: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17767: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17770: \$? = $ac_status" >&5
+  echo "$as_me:17757: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 17777 "configure"
+#line 17764 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17787,16 +17774,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17793: \$? = $ac_status" >&5
+  echo "$as_me:17780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17799: \$? = $ac_status" >&5
+  echo "$as_me:17786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -17808,7 +17795,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17811: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:17798: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -17835,7 +17822,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 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:17838: checking for $ac_word" >&5
+echo "$as_me:17825: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17852,7 +17839,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:17855: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17842: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17863,10 +17850,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:17866: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:17853: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:17869: result: no" >&5
+  echo "$as_me:17856: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17881,7 +17868,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:17884: checking if we have identified curses headers" >&5
+echo "$as_me:17871: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17895,7 +17882,7 @@ for cf_header in  \
 	ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17898 "configure"
+#line 17885 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -17907,16 +17894,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17913: \$? = $ac_status" >&5
+  echo "$as_me:17900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17919: \$? = $ac_status" >&5
+  echo "$as_me:17906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -17927,11 +17914,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17930: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:17917: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:17934: error: No curses header-files found" >&5
+	{ { echo "$as_me:17921: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17941,23 +17928,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:17944: checking for $ac_header" >&5
+echo "$as_me:17931: 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 17950 "configure"
+#line 17937 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:17954: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:17941: \"$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:17960: \$? = $ac_status" >&5
+  echo "$as_me:17947: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -17976,7 +17963,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:17979: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:17966: 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
@@ -18029,7 +18016,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18032 "configure"
+#line 18019 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18041,16 +18028,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18031: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18047: \$? = $ac_status" >&5
+  echo "$as_me:18034: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18053: \$? = $ac_status" >&5
+  echo "$as_me:18040: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18067,7 +18054,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18070: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18057: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18084,7 +18071,7 @@ fi
 
 }
 
-echo "$as_me:18087: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:18074: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18096,7 +18083,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18099 "configure"
+#line 18086 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18120,16 +18107,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18110: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18126: \$? = $ac_status" >&5
+  echo "$as_me:18113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18132: \$? = $ac_status" >&5
+  echo "$as_me:18119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -18144,14 +18131,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:18147: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18134: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:18154: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18141: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18291,7 +18278,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18294 "configure"
+#line 18281 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18303,16 +18290,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18309: \$? = $ac_status" >&5
+  echo "$as_me:18296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18315: \$? = $ac_status" >&5
+  echo "$as_me:18302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18329,7 +18316,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18332: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18319: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18350,7 +18337,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18353 "configure"
+#line 18340 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18374,16 +18361,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18364: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18380: \$? = $ac_status" >&5
+  echo "$as_me:18367: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18386: \$? = $ac_status" >&5
+  echo "$as_me:18373: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -18404,12 +18391,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18407: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18394: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:18412: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:18399: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -18442,7 +18429,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18445 "configure"
+#line 18432 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18454,16 +18441,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18460: \$? = $ac_status" >&5
+  echo "$as_me:18447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18466: \$? = $ac_status" >&5
+  echo "$as_me:18453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18480,7 +18467,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18483: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18470: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18523,7 +18510,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18526: checking for terminfo header" >&5
+echo "$as_me:18513: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18541,7 +18528,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18544 "configure"
+#line 18531 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -18556,16 +18543,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18562: \$? = $ac_status" >&5
+  echo "$as_me:18549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18568: \$? = $ac_status" >&5
+  echo "$as_me:18555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18581,7 +18568,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18584: result: $cf_cv_term_header" >&5
+echo "$as_me:18571: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18615,7 +18602,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:18618: checking for ncurses version" >&5
+echo "$as_me:18605: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18641,10 +18628,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18644: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18631: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18647: \$? = $ac_status" >&5
+  echo "$as_me:18634: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -18654,7 +18641,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18657 "configure"
+#line 18644 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -18679,15 +18666,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18669: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18685: \$? = $ac_status" >&5
+  echo "$as_me:18672: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18690: \$? = $ac_status" >&5
+  echo "$as_me:18677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18701,7 +18688,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18704: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18691: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -18713,7 +18700,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:18716: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:18703: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18721,7 +18708,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18724 "configure"
+#line 18711 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18740,16 +18727,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18746: \$? = $ac_status" >&5
+  echo "$as_me:18733: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18752: \$? = $ac_status" >&5
+  echo "$as_me:18739: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -18760,10 +18747,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18763: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:18750: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:18766: checking for initscr in -lgpm" >&5
+  echo "$as_me:18753: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18771,7 +18758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18774 "configure"
+#line 18761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18790,16 +18777,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18796: \$? = $ac_status" >&5
+  echo "$as_me:18783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18802: \$? = $ac_status" >&5
+  echo "$as_me:18789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -18810,7 +18797,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18813: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:18800: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -18825,7 +18812,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:18828: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:18815: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18833,7 +18820,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18836 "configure"
+#line 18823 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18852,16 +18839,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18858: \$? = $ac_status" >&5
+  echo "$as_me:18845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18864: \$? = $ac_status" >&5
+  echo "$as_me:18851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18872,7 +18859,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18875: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18862: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -18906,7 +18893,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:18909: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:18896: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18919,13 +18906,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:18922: checking for initscr" >&5
+	echo "$as_me:18909: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18928 "configure"
+#line 18915 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -18956,16 +18943,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18962: \$? = $ac_status" >&5
+  echo "$as_me:18949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18968: \$? = $ac_status" >&5
+  echo "$as_me:18955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -18975,18 +18962,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18978: result: $ac_cv_func_initscr" >&5
+echo "$as_me:18965: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:18985: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:18972: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18989 "configure"
+#line 18976 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -18998,25 +18985,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19004: \$? = $ac_status" >&5
+  echo "$as_me:18991: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19010: \$? = $ac_status" >&5
+  echo "$as_me:18997: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19012: result: yes" >&5
+  echo "$as_me:18999: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19019: result: no" >&5
+echo "$as_me:19006: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -19106,11 +19093,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19109: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:19096: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 19113 "configure"
+#line 19100 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19122,25 +19109,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19128: \$? = $ac_status" >&5
+  echo "$as_me:19115: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19134: \$? = $ac_status" >&5
+  echo "$as_me:19121: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19136: result: yes" >&5
+  echo "$as_me:19123: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19143: result: no" >&5
+echo "$as_me:19130: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19155,7 +19142,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19158: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19145: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19163,7 +19150,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:19166: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19153: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -19173,7 +19160,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19176 "configure"
+#line 19163 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19185,23 +19172,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19175: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19191: \$? = $ac_status" >&5
+  echo "$as_me:19178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19197: \$? = $ac_status" >&5
+  echo "$as_me:19184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19199: result: yes" >&5
+  echo "$as_me:19186: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19204: result: no" >&5
+echo "$as_me:19191: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -19219,7 +19206,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:19222: checking for multibyte character support" >&5
+echo "$as_me:19209: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19227,7 +19214,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19230 "configure"
+#line 19217 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19240,16 +19227,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19246: \$? = $ac_status" >&5
+  echo "$as_me:19233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19252: \$? = $ac_status" >&5
+  echo "$as_me:19239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -19261,12 +19248,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:19264: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:19251: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19269 "configure"
+#line 19256 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19279,16 +19266,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19285: \$? = $ac_status" >&5
+  echo "$as_me:19272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19291: \$? = $ac_status" >&5
+  echo "$as_me:19278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19302,7 +19289,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19305 "configure"
+#line 19292 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19315,16 +19302,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19321: \$? = $ac_status" >&5
+  echo "$as_me:19308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19327: \$? = $ac_status" >&5
+  echo "$as_me:19314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19341,9 +19328,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me-configure}:19344: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me-configure}:19331: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me-configure}:19346: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:19333: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19456,11 +19443,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:19459: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:19446: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
         cat >conftest.$ac_ext <<_ACEOF
-#line 19463 "configure"
+#line 19450 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19473,21 +19460,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19479: \$? = $ac_status" >&5
+  echo "$as_me:19466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19485: \$? = $ac_status" >&5
+  echo "$as_me:19472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:19490: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:19477: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19505,7 +19492,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:19508: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:19495: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -19602,13 +19589,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:19605: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:19592: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lutf8  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
             cat >conftest.$ac_ext <<_ACEOF
-#line 19611 "configure"
+#line 19598 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19621,21 +19608,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19627: \$? = $ac_status" >&5
+  echo "$as_me:19614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19633: \$? = $ac_status" >&5
+  echo "$as_me:19620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:19638: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:19625: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -19677,7 +19664,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19680: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:19667: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -19711,7 +19698,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19714 "configure"
+#line 19701 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19723,16 +19710,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19729: \$? = $ac_status" >&5
+  echo "$as_me:19716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19735: \$? = $ac_status" >&5
+  echo "$as_me:19722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19749,7 +19736,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:19752: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:19739: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19783,7 +19770,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:19786: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:19773: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19801,7 +19788,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 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:19804: checking for $ac_word" >&5
+echo "$as_me:19791: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19818,7 +19805,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:19821: found $ac_dir/$ac_word" >&5
+   echo "$as_me:19808: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -19829,10 +19816,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:19832: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:19819: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:19835: result: no" >&5
+  echo "$as_me:19822: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -19847,7 +19834,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS"
 
 # even with config script, some packages use no-override for curses.h
 
-echo "$as_me:19850: checking if we have identified curses headers" >&5
+echo "$as_me:19837: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19861,7 +19848,7 @@ for cf_header in  \
 	ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19864 "configure"
+#line 19851 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -19873,16 +19860,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19879: \$? = $ac_status" >&5
+  echo "$as_me:19866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19885: \$? = $ac_status" >&5
+  echo "$as_me:19872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -19893,11 +19880,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19896: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:19883: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:19900: error: No curses header-files found" >&5
+	{ { echo "$as_me:19887: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19907,23 +19894,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:19910: checking for $ac_header" >&5
+echo "$as_me:19897: 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 19916 "configure"
+#line 19903 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:19920: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:19907: \"$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:19926: \$? = $ac_status" >&5
+  echo "$as_me:19913: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19942,7 +19929,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19945: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19932: 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
@@ -19995,7 +19982,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19998 "configure"
+#line 19985 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20007,16 +19994,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20013: \$? = $ac_status" >&5
+  echo "$as_me:20000: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20019: \$? = $ac_status" >&5
+  echo "$as_me:20006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20033,7 +20020,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20036: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:20023: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20050,7 +20037,7 @@ fi
 
 }
 
-echo "$as_me:20053: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20040: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20062,7 +20049,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20065 "configure"
+#line 20052 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -20094,16 +20081,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20084: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20100: \$? = $ac_status" >&5
+  echo "$as_me:20087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20106: \$? = $ac_status" >&5
+  echo "$as_me:20093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20118,14 +20105,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20121: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20108: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:20128: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20115: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20265,7 +20252,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20268 "configure"
+#line 20255 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20277,16 +20264,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20283: \$? = $ac_status" >&5
+  echo "$as_me:20270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20289: \$? = $ac_status" >&5
+  echo "$as_me:20276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20303,7 +20290,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20306: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:20293: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20324,7 +20311,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20327 "configure"
+#line 20314 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20348,16 +20335,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20354: \$? = $ac_status" >&5
+  echo "$as_me:20341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20360: \$? = $ac_status" >&5
+  echo "$as_me:20347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20378,12 +20365,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20381: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20368: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20386: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20373: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -20416,7 +20403,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20419 "configure"
+#line 20406 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20428,16 +20415,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20434: \$? = $ac_status" >&5
+  echo "$as_me:20421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20440: \$? = $ac_status" >&5
+  echo "$as_me:20427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20454,7 +20441,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:20457: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:20444: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20497,7 +20484,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20500: checking for terminfo header" >&5
+echo "$as_me:20487: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20515,7 +20502,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20518 "configure"
+#line 20505 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -20530,16 +20517,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20536: \$? = $ac_status" >&5
+  echo "$as_me:20523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20542: \$? = $ac_status" >&5
+  echo "$as_me:20529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20555,7 +20542,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20558: result: $cf_cv_term_header" >&5
+echo "$as_me:20545: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -20589,7 +20576,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:20592: checking for ncurses version" >&5
+echo "$as_me:20579: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20615,10 +20602,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:20618: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20605: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:20621: \$? = $ac_status" >&5
+  echo "$as_me:20608: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -20628,7 +20615,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20631 "configure"
+#line 20618 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -20653,15 +20640,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20643: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20659: \$? = $ac_status" >&5
+  echo "$as_me:20646: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20664: \$? = $ac_status" >&5
+  echo "$as_me:20651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -20675,7 +20662,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:20678: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:20665: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -20687,7 +20674,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:20690: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:20677: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20695,7 +20682,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20698 "configure"
+#line 20685 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20714,16 +20701,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20720: \$? = $ac_status" >&5
+  echo "$as_me:20707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20726: \$? = $ac_status" >&5
+  echo "$as_me:20713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -20734,10 +20721,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20737: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:20724: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:20740: checking for initscr in -lgpm" >&5
+  echo "$as_me:20727: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20745,7 +20732,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20748 "configure"
+#line 20735 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20764,16 +20751,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20770: \$? = $ac_status" >&5
+  echo "$as_me:20757: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20776: \$? = $ac_status" >&5
+  echo "$as_me:20763: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -20784,7 +20771,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20787: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:20774: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -20799,7 +20786,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:20802: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:20789: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20807,7 +20794,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20810 "configure"
+#line 20797 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20826,16 +20813,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20832: \$? = $ac_status" >&5
+  echo "$as_me:20819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20835: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20838: \$? = $ac_status" >&5
+  echo "$as_me:20825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -20846,7 +20833,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20849: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:20836: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -20880,7 +20867,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:20883: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:20870: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -20893,13 +20880,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:20896: checking for initscr" >&5
+	echo "$as_me:20883: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20902 "configure"
+#line 20889 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -20930,16 +20917,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20936: \$? = $ac_status" >&5
+  echo "$as_me:20923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20942: \$? = $ac_status" >&5
+  echo "$as_me:20929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -20949,18 +20936,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20952: result: $ac_cv_func_initscr" >&5
+echo "$as_me:20939: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:20959: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:20946: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20963 "configure"
+#line 20950 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -20972,25 +20959,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20978: \$? = $ac_status" >&5
+  echo "$as_me:20965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20984: \$? = $ac_status" >&5
+  echo "$as_me:20971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20986: result: yes" >&5
+  echo "$as_me:20973: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20993: result: no" >&5
+echo "$as_me:20980: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21080,11 +21067,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21083: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21070: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 21087 "configure"
+#line 21074 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -21096,25 +21083,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21102: \$? = $ac_status" >&5
+  echo "$as_me:21089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21108: \$? = $ac_status" >&5
+  echo "$as_me:21095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21110: result: yes" >&5
+  echo "$as_me:21097: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21117: result: no" >&5
+echo "$as_me:21104: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21129,7 +21116,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21132: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21119: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21137,7 +21124,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21140: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21127: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -21147,7 +21134,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21150 "configure"
+#line 21137 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -21159,23 +21146,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21165: \$? = $ac_status" >&5
+  echo "$as_me:21152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21171: \$? = $ac_status" >&5
+  echo "$as_me:21158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21173: result: yes" >&5
+  echo "$as_me:21160: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21178: result: no" >&5
+echo "$as_me:21165: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21198,7 +21185,7 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:21201: checking for slang header file" >&5
+echo "$as_me:21188: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21206,7 +21193,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21209 "configure"
+#line 21196 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21218,16 +21205,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21224: \$? = $ac_status" >&5
+  echo "$as_me:21211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21230: \$? = $ac_status" >&5
+  echo "$as_me:21217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -21354,7 +21341,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21357: result: $cf_cv_slang_header" >&5
+echo "$as_me:21344: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -21394,7 +21381,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21397 "configure"
+#line 21384 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21406,16 +21393,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21412: \$? = $ac_status" >&5
+  echo "$as_me:21399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21418: \$? = $ac_status" >&5
+  echo "$as_me:21405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21432,7 +21419,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:21435: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:21422: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21462,7 +21449,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 21465 "configure"
+#line 21452 "configure"
 #include "confdefs.h"
 
 int
@@ -21474,19 +21461,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21480: \$? = $ac_status" >&5
+  echo "$as_me:21467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21486: \$? = $ac_status" >&5
+  echo "$as_me:21473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 21489 "configure"
+#line 21476 "configure"
 #include "confdefs.h"
 
 int
@@ -21498,16 +21485,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21504: \$? = $ac_status" >&5
+  echo "$as_me:21491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21510: \$? = $ac_status" >&5
+  echo "$as_me:21497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -21518,7 +21505,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:21521: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:21508: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -21533,10 +21520,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:21536: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:21523: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21539 "configure"
+#line 21526 "configure"
 #include "confdefs.h"
 
 int
@@ -21548,16 +21535,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21554: \$? = $ac_status" >&5
+  echo "$as_me:21541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21560: \$? = $ac_status" >&5
+  echo "$as_me:21547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -21566,7 +21553,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:21569: result: $cf_result" >&5
+		echo "$as_me:21556: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -21583,7 +21570,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:21586: checking for initscr in -lcurses" >&5
+	echo "$as_me:21573: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21591,7 +21578,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21594 "configure"
+#line 21581 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21610,16 +21597,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21600: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21616: \$? = $ac_status" >&5
+  echo "$as_me:21603: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21622: \$? = $ac_status" >&5
+  echo "$as_me:21609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -21630,13 +21617,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21633: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:21620: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:21639: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:21626: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21644,7 +21631,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21647 "configure"
+#line 21634 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21663,16 +21650,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21669: \$? = $ac_status" >&5
+  echo "$as_me:21656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21675: \$? = $ac_status" >&5
+  echo "$as_me:21662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -21683,7 +21670,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21686: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:21673: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -21694,20 +21681,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:21697: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:21684: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:21704: checking for acos" >&5
+echo "$as_me:21691: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21710 "configure"
+#line 21697 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -21738,16 +21725,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21744: \$? = $ac_status" >&5
+  echo "$as_me:21731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21750: \$? = $ac_status" >&5
+  echo "$as_me:21737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -21757,13 +21744,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21760: result: $ac_cv_func_acos" >&5
+echo "$as_me:21747: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:21766: checking for acos in -lm" >&5
+echo "$as_me:21753: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21771,7 +21758,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21774 "configure"
+#line 21761 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21790,16 +21777,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21796: \$? = $ac_status" >&5
+  echo "$as_me:21783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21802: \$? = $ac_status" >&5
+  echo "$as_me:21789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -21810,7 +21797,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21813: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:21800: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -21836,13 +21823,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:21839: checking for v_init" >&5
+	echo "$as_me:21826: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21845 "configure"
+#line 21832 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -21873,16 +21860,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21879: \$? = $ac_status" >&5
+  echo "$as_me:21866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21885: \$? = $ac_status" >&5
+  echo "$as_me:21872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -21892,18 +21879,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21895: result: $ac_cv_func_v_init" >&5
+echo "$as_me:21882: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:21902: checking for v_init in -lvideo" >&5
+		echo "$as_me:21889: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21906 "configure"
+#line 21893 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -21915,25 +21902,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21921: \$? = $ac_status" >&5
+  echo "$as_me:21908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21927: \$? = $ac_status" >&5
+  echo "$as_me:21914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21929: result: yes" >&5
+  echo "$as_me:21916: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21936: result: no" >&5
+echo "$as_me:21923: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22023,11 +22010,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22026: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:22013: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22030 "configure"
+#line 22017 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -22039,25 +22026,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22045: \$? = $ac_status" >&5
+  echo "$as_me:22032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22051: \$? = $ac_status" >&5
+  echo "$as_me:22038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22053: result: yes" >&5
+  echo "$as_me:22040: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22060: result: no" >&5
+echo "$as_me:22047: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22072,7 +22059,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22075: error: Cannot link video library" >&5
+	{ { echo "$as_me:22062: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22082,13 +22069,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:22085: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:22072: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22091 "configure"
+#line 22078 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -22119,16 +22106,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22125: \$? = $ac_status" >&5
+  echo "$as_me:22112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22131: \$? = $ac_status" >&5
+  echo "$as_me:22118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -22138,18 +22125,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22141: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:22128: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:22148: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:22135: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22152 "configure"
+#line 22139 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22161,25 +22148,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22167: \$? = $ac_status" >&5
+  echo "$as_me:22154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22173: \$? = $ac_status" >&5
+  echo "$as_me:22160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22175: result: yes" >&5
+  echo "$as_me:22162: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22182: result: no" >&5
+echo "$as_me:22169: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22269,11 +22256,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22272: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:22259: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 22276 "configure"
+#line 22263 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22285,25 +22272,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22291: \$? = $ac_status" >&5
+  echo "$as_me:22278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22297: \$? = $ac_status" >&5
+  echo "$as_me:22284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22299: result: yes" >&5
+  echo "$as_me:22286: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22306: result: no" >&5
+echo "$as_me:22293: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22318,13 +22305,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22321: error: Cannot link slang library" >&5
+	{ { echo "$as_me:22308: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:22327: checking if we can link slang without termcap" >&5
+echo "$as_me:22314: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -22333,7 +22320,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 22336 "configure"
+#line 22323 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22345,16 +22332,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22335: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22351: \$? = $ac_status" >&5
+  echo "$as_me:22338: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22341: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22357: \$? = $ac_status" >&5
+  echo "$as_me:22344: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22363,13 +22350,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:22366: result: $cf_result" >&5
+echo "$as_me:22353: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:22372: checking for slang2 header file" >&5
+echo "$as_me:22359: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22377,7 +22364,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22380 "configure"
+#line 22367 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -22389,16 +22376,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22392: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22395: \$? = $ac_status" >&5
+  echo "$as_me:22382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22401: \$? = $ac_status" >&5
+  echo "$as_me:22388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -22525,7 +22512,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22528: result: $cf_cv_slang2_header" >&5
+echo "$as_me:22515: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -22565,7 +22552,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22568 "configure"
+#line 22555 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22577,16 +22564,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22583: \$? = $ac_status" >&5
+  echo "$as_me:22570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22589: \$? = $ac_status" >&5
+  echo "$as_me:22576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22603,7 +22590,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:22606: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:22593: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22633,7 +22620,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 22636 "configure"
+#line 22623 "configure"
 #include "confdefs.h"
 
 int
@@ -22645,19 +22632,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22635: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22651: \$? = $ac_status" >&5
+  echo "$as_me:22638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22657: \$? = $ac_status" >&5
+  echo "$as_me:22644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 22660 "configure"
+#line 22647 "configure"
 #include "confdefs.h"
 
 int
@@ -22669,16 +22656,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22675: \$? = $ac_status" >&5
+  echo "$as_me:22662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22681: \$? = $ac_status" >&5
+  echo "$as_me:22668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -22689,7 +22676,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:22692: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:22679: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -22704,10 +22691,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:22707: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:22694: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22710 "configure"
+#line 22697 "configure"
 #include "confdefs.h"
 
 int
@@ -22719,16 +22706,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22725: \$? = $ac_status" >&5
+  echo "$as_me:22712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22731: \$? = $ac_status" >&5
+  echo "$as_me:22718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -22737,7 +22724,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:22740: result: $cf_result" >&5
+		echo "$as_me:22727: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -22754,7 +22741,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:22757: checking for initscr in -lcurses" >&5
+	echo "$as_me:22744: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22762,7 +22749,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22765 "configure"
+#line 22752 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22781,16 +22768,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22787: \$? = $ac_status" >&5
+  echo "$as_me:22774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22793: \$? = $ac_status" >&5
+  echo "$as_me:22780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -22801,13 +22788,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22804: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:22791: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:22810: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:22797: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22815,7 +22802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22818 "configure"
+#line 22805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22834,16 +22821,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22840: \$? = $ac_status" >&5
+  echo "$as_me:22827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22846: \$? = $ac_status" >&5
+  echo "$as_me:22833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -22854,7 +22841,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22857: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:22844: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -22865,20 +22852,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:22868: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:22855: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:22875: checking for acos" >&5
+echo "$as_me:22862: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22881 "configure"
+#line 22868 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -22909,16 +22896,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22899: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22915: \$? = $ac_status" >&5
+  echo "$as_me:22902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22921: \$? = $ac_status" >&5
+  echo "$as_me:22908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -22928,13 +22915,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22931: result: $ac_cv_func_acos" >&5
+echo "$as_me:22918: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:22937: checking for acos in -lm" >&5
+echo "$as_me:22924: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22942,7 +22929,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22945 "configure"
+#line 22932 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22961,16 +22948,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22967: \$? = $ac_status" >&5
+  echo "$as_me:22954: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22973: \$? = $ac_status" >&5
+  echo "$as_me:22960: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -22981,7 +22968,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22984: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:22971: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -23007,13 +22994,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23010: checking for v_init" >&5
+	echo "$as_me:22997: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23016 "configure"
+#line 23003 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23044,16 +23031,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23050: \$? = $ac_status" >&5
+  echo "$as_me:23037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23056: \$? = $ac_status" >&5
+  echo "$as_me:23043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23063,18 +23050,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23066: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23053: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23073: checking for v_init in -lvideo" >&5
+		echo "$as_me:23060: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23077 "configure"
+#line 23064 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23086,25 +23073,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23092: \$? = $ac_status" >&5
+  echo "$as_me:23079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23098: \$? = $ac_status" >&5
+  echo "$as_me:23085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23100: result: yes" >&5
+  echo "$as_me:23087: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23107: result: no" >&5
+echo "$as_me:23094: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23194,11 +23181,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23197: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23184: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23201 "configure"
+#line 23188 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23210,25 +23197,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23213: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23216: \$? = $ac_status" >&5
+  echo "$as_me:23203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23222: \$? = $ac_status" >&5
+  echo "$as_me:23209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23224: result: yes" >&5
+  echo "$as_me:23211: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23231: result: no" >&5
+echo "$as_me:23218: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23243,7 +23230,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23246: error: Cannot link video library" >&5
+	{ { echo "$as_me:23233: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23253,13 +23240,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:23256: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23243: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23262 "configure"
+#line 23249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -23290,16 +23277,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23296: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23302: \$? = $ac_status" >&5
+  echo "$as_me:23289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -23309,18 +23296,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23312: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:23299: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:23319: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:23306: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23323 "configure"
+#line 23310 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23332,25 +23319,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23338: \$? = $ac_status" >&5
+  echo "$as_me:23325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23344: \$? = $ac_status" >&5
+  echo "$as_me:23331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23346: result: yes" >&5
+  echo "$as_me:23333: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23353: result: no" >&5
+echo "$as_me:23340: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23440,11 +23427,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23443: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:23430: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 23447 "configure"
+#line 23434 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23456,25 +23443,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23462: \$? = $ac_status" >&5
+  echo "$as_me:23449: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23468: \$? = $ac_status" >&5
+  echo "$as_me:23455: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23470: result: yes" >&5
+  echo "$as_me:23457: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23477: result: no" >&5
+echo "$as_me:23464: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23489,13 +23476,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23492: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:23479: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:23498: checking if we can link slang2 without termcap" >&5
+echo "$as_me:23485: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -23504,7 +23491,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 23507 "configure"
+#line 23494 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23516,16 +23503,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23522: \$? = $ac_status" >&5
+  echo "$as_me:23509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23528: \$? = $ac_status" >&5
+  echo "$as_me:23515: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23534,12 +23521,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:23537: result: $cf_result" >&5
+echo "$as_me:23524: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:23542: error: cannot find slang headers" >&5
+		{ { echo "$as_me:23529: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -23547,14 +23534,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:23550: checking if we must define UTF8" >&5
+echo "$as_me:23537: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23557 "configure"
+#line 23544 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23566,16 +23553,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23572: \$? = $ac_status" >&5
+  echo "$as_me:23559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23578: \$? = $ac_status" >&5
+  echo "$as_me:23565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -23583,7 +23570,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23586 "configure"
+#line 23573 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -23597,16 +23584,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23603: \$? = $ac_status" >&5
+  echo "$as_me:23590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23609: \$? = $ac_status" >&5
+  echo "$as_me:23596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -23619,7 +23606,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23622: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:23609: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -23629,14 +23616,14 @@ EOF
 
 fi
 
-echo "$as_me:23632: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:23619: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23639 "configure"
+#line 23626 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23655,16 +23642,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23661: \$? = $ac_status" >&5
+  echo "$as_me:23648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23667: \$? = $ac_status" >&5
+  echo "$as_me:23654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -23675,7 +23662,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23678: result: $cf_cv_slang_unix" >&5
+echo "$as_me:23665: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
@@ -23685,14 +23672,14 @@ EOF
 	;;
 esac
 
-echo "$as_me:23688: checking for chtype typedef" >&5
+echo "$as_me:23675: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23695 "configure"
+#line 23682 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -23704,16 +23691,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23710: \$? = $ac_status" >&5
+  echo "$as_me:23697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23716: \$? = $ac_status" >&5
+  echo "$as_me:23703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -23723,21 +23710,21 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23726: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:23713: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 	cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:23733: checking if chtype is scalar or struct" >&5
+	echo "$as_me:23720: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23740 "configure"
+#line 23727 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -23749,16 +23736,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23739: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23755: \$? = $ac_status" >&5
+  echo "$as_me:23742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23761: \$? = $ac_status" >&5
+  echo "$as_me:23748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -23768,7 +23755,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23771: result: $cf_cv_chtype_type" >&5
+echo "$as_me:23758: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 		cat >>confdefs.h <<\EOF
@@ -23778,7 +23765,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:23781: checking if you want the wide-curses features" >&5
+echo "$as_me:23768: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -23795,10 +23782,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:23798: result: $use_wide_curses" >&5
+echo "$as_me:23785: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:23801: checking if color-style code should be used" >&5
+echo "$as_me:23788: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -23818,7 +23805,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:23821: result: no" >&5
+	echo "$as_me:23808: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -23827,10 +23814,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:23830: result: yes" >&5
+	echo "$as_me:23817: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:23833: checking for location of style-sheet file" >&5
+	echo "$as_me:23820: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -23866,7 +23853,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:23869: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:23856: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -23875,7 +23862,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:23878: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:23865: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -23887,7 +23874,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:23890: checking for the default configuration-file" >&5
+echo "$as_me:23877: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -23923,7 +23910,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:23926: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:23913: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -23932,7 +23919,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:23935: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:23922: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -23940,7 +23927,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:23943: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:23930: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -23957,7 +23944,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:23960: result: $use_htmlized_cfg" >&5
+echo "$as_me:23947: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -23965,7 +23952,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:23968: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:23955: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -23982,7 +23969,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:23985: result: $use_local_docs" >&5
+echo "$as_me:23972: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -23990,7 +23977,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:23993: checking for MIME library directory" >&5
+echo "$as_me:23980: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -24026,7 +24013,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:24029: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:24016: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -24035,14 +24022,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:24038: result: $MIME_LIBDIR" >&5
+echo "$as_me:24025: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:24045: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:24032: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -24059,7 +24046,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:24062: result: $use_locale_charset" >&5
+echo "$as_me:24049: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -24067,7 +24054,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:24070: checking if you want only a few charsets" >&5
+echo "$as_me:24057: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -24079,7 +24066,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:24082: result: yes" >&5
+	echo "$as_me:24069: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -24092,7 +24079,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me-configure}:24095: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:24082: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -24119,28 +24106,28 @@ echo "${as_me-configure}:24095: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:24122: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:24109: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me-configure}:24128: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:24115: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:24133: result: no" >&5
+	echo "$as_me:24120: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:24137: checking for ANSI C header files" >&5
+echo "$as_me:24124: 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 24143 "configure"
+#line 24130 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -24148,13 +24135,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:24151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24138: \"$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:24157: \$? = $ac_status" >&5
+  echo "$as_me:24144: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24176,7 +24163,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 24179 "configure"
+#line 24166 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -24194,7 +24181,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 24197 "configure"
+#line 24184 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -24215,7 +24202,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24218 "configure"
+#line 24205 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -24241,15 +24228,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24247: \$? = $ac_status" >&5
+  echo "$as_me:24234: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24252: \$? = $ac_status" >&5
+  echo "$as_me:24239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24262,7 +24249,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:24265: result: $ac_cv_header_stdc" >&5
+echo "$as_me:24252: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -24272,13 +24259,13 @@ EOF
 
 fi
 
-echo "$as_me:24275: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:24262: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24281 "configure"
+#line 24268 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -24294,16 +24281,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24300: \$? = $ac_status" >&5
+  echo "$as_me:24287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24306: \$? = $ac_status" >&5
+  echo "$as_me:24293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -24313,7 +24300,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24316: result: $ac_cv_header_time" >&5
+echo "$as_me:24303: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -24326,13 +24313,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:24329: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:24316: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24335 "configure"
+#line 24322 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -24347,16 +24334,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24353: \$? = $ac_status" >&5
+  echo "$as_me:24340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24359: \$? = $ac_status" >&5
+  echo "$as_me:24346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -24366,7 +24353,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24369: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24356: 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
@@ -24379,7 +24366,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:24382: checking for opendir in -ldir" >&5
+  echo "$as_me:24369: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24387,7 +24374,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24390 "configure"
+#line 24377 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24406,16 +24393,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24412: \$? = $ac_status" >&5
+  echo "$as_me:24399: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24418: \$? = $ac_status" >&5
+  echo "$as_me:24405: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -24426,14 +24413,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24429: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:24416: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:24436: checking for opendir in -lx" >&5
+  echo "$as_me:24423: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24441,7 +24428,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24444 "configure"
+#line 24431 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24460,16 +24447,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24466: \$? = $ac_status" >&5
+  echo "$as_me:24453: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24472: \$? = $ac_status" >&5
+  echo "$as_me:24459: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -24480,7 +24467,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24483: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:24470: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -24508,23 +24495,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24511: checking for $ac_header" >&5
+echo "$as_me:24498: 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 24517 "configure"
+#line 24504 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24521: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24508: \"$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:24527: \$? = $ac_status" >&5
+  echo "$as_me:24514: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24543,7 +24530,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24546: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24533: 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
@@ -24553,14 +24540,14 @@ EOF
 fi
 done
 
-echo "$as_me:24556: checking termio.h and termios.h" >&5
+echo "$as_me:24543: checking termio.h and termios.h" >&5
 echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
 if test "${cf_cv_termio_and_termios+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 24563 "configure"
+#line 24550 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -24578,16 +24565,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24581: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24584: \$? = $ac_status" >&5
+  echo "$as_me:24571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24590: \$? = $ac_status" >&5
+  echo "$as_me:24577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -24598,20 +24585,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:24601: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:24588: result: $cf_cv_termio_and_termios" >&5
 echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
 test $cf_cv_termio_and_termios = no && cat >>confdefs.h <<\EOF
 #define TERMIO_AND_TERMIOS 1
 EOF
 
-echo "$as_me:24607: checking for sigaction and structs" >&5
+echo "$as_me:24594: checking for sigaction and structs" >&5
 echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
 if test "${cf_cv_func_sigaction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24614 "configure"
+#line 24601 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24631,16 +24618,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24637: \$? = $ac_status" >&5
+  echo "$as_me:24624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24640: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24643: \$? = $ac_status" >&5
+  echo "$as_me:24630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -24651,7 +24638,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24654: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:24641: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -24660,23 +24647,23 @@ EOF
 for ac_header in sys/wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24663: checking for $ac_header" >&5
+echo "$as_me:24650: 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 24669 "configure"
+#line 24656 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24673: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24660: \"$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:24679: \$? = $ac_status" >&5
+  echo "$as_me:24666: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24695,7 +24682,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24698: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24685: 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
@@ -24716,23 +24703,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24719: checking for $ac_header" >&5
+echo "$as_me:24706: 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 24725 "configure"
+#line 24712 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24729: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24716: \"$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:24735: \$? = $ac_status" >&5
+  echo "$as_me:24722: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24751,7 +24738,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24754: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24741: 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
@@ -24764,23 +24751,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24767: checking for $ac_header" >&5
+echo "$as_me:24754: 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 24773 "configure"
+#line 24760 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24777: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24764: \"$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:24783: \$? = $ac_status" >&5
+  echo "$as_me:24770: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24799,7 +24786,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24802: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24789: 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
@@ -24821,14 +24808,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:24824: checking for union wait" >&5
+echo "$as_me:24811: checking for union wait" >&5
 echo $ECHO_N "checking for union wait... $ECHO_C" >&6
 if test "${cf_cv_type_unionwait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24831 "configure"
+#line 24818 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -24844,16 +24831,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24850: \$? = $ac_status" >&5
+  echo "$as_me:24837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24856: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -24863,7 +24850,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24866 "configure"
+#line 24853 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -24883,16 +24870,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24889: \$? = $ac_status" >&5
+  echo "$as_me:24876: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24895: \$? = $ac_status" >&5
+  echo "$as_me:24882: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -24907,7 +24894,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:24910: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:24897: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -24915,14 +24902,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:24918: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:24905: checking if union wait can be used as wait-arg" >&5
 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_wait+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24925 "configure"
+#line 24912 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -24934,16 +24921,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24940: \$? = $ac_status" >&5
+  echo "$as_me:24927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24946: \$? = $ac_status" >&5
+  echo "$as_me:24933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -24955,20 +24942,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:24958: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:24945: result: $cf_cv_arg_union_wait" >&5
 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
 	test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF
 #define WAIT_USES_UNION 1
 EOF
 
-	echo "$as_me:24964: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:24951: checking if union wait can be used as waitpid-arg" >&5
 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
 	if test "${cf_cv_arg_union_waitpid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24971 "configure"
+#line 24958 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -24980,16 +24967,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24970: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24986: \$? = $ac_status" >&5
+  echo "$as_me:24973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24992: \$? = $ac_status" >&5
+  echo "$as_me:24979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -25001,7 +24988,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25004: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:24991: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -25009,13 +24996,13 @@ EOF
 
 fi
 
-echo "$as_me:25012: checking for uid_t in sys/types.h" >&5
+echo "$as_me:24999: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25018 "configure"
+#line 25005 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25029,7 +25016,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:25032: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25019: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -25043,7 +25030,7 @@ EOF
 
 fi
 
-echo "$as_me:25046: checking type of array argument to getgroups" >&5
+echo "$as_me:25033: checking type of array argument to getgroups" >&5
 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
 if test "${ac_cv_type_getgroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25052,7 +25039,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25055 "configure"
+#line 25042 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -25078,15 +25065,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25084: \$? = $ac_status" >&5
+  echo "$as_me:25071: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25089: \$? = $ac_status" >&5
+  echo "$as_me:25076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -25099,7 +25086,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 25102 "configure"
+#line 25089 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -25114,20 +25101,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:25117: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:25104: result: $ac_cv_type_getgroups" >&5
 echo "${ECHO_T}$ac_cv_type_getgroups" >&6
 
 cat >>confdefs.h <<EOF
 #define GETGROUPS_T $ac_cv_type_getgroups
 EOF
 
-echo "$as_me:25124: checking for off_t" >&5
+echo "$as_me:25111: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25130 "configure"
+#line 25117 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25142,16 +25129,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25148: \$? = $ac_status" >&5
+  echo "$as_me:25135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25154: \$? = $ac_status" >&5
+  echo "$as_me:25141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -25161,7 +25148,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25164: result: $ac_cv_type_off_t" >&5
+echo "$as_me:25151: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
@@ -25173,13 +25160,13 @@ EOF
 
 fi
 
-echo "$as_me:25176: checking for pid_t" >&5
+echo "$as_me:25163: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25182 "configure"
+#line 25169 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25194,16 +25181,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25184: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25200: \$? = $ac_status" >&5
+  echo "$as_me:25187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25206: \$? = $ac_status" >&5
+  echo "$as_me:25193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -25213,7 +25200,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25216: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:25203: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
   :
@@ -25225,13 +25212,13 @@ EOF
 
 fi
 
-echo "$as_me:25228: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25215: checking for uid_t in sys/types.h" >&5
 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25234 "configure"
+#line 25221 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25245,7 +25232,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:25248: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25235: result: $ac_cv_type_uid_t" >&5
 echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
@@ -25259,13 +25246,13 @@ EOF
 
 fi
 
-echo "$as_me:25262: checking for mode_t" >&5
+echo "$as_me:25249: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25268 "configure"
+#line 25255 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25280,16 +25267,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25286: \$? = $ac_status" >&5
+  echo "$as_me:25273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -25299,7 +25286,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25302: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:25289: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
   :
@@ -25311,13 +25298,13 @@ EOF
 
 fi
 
-	echo "$as_me:25314: checking for socklen_t" >&5
+	echo "$as_me:25301: 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 25320 "configure"
+#line 25307 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25335,16 +25322,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25341: \$? = $ac_status" >&5
+  echo "$as_me:25328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25347: \$? = $ac_status" >&5
+  echo "$as_me:25334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -25354,7 +25341,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25357: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:25344: 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
   ac_cv_type_socklen_t=yes
@@ -25369,14 +25356,14 @@ EOF
 
 fi
 
-echo "$as_me:25372: checking for long long type" >&5
+echo "$as_me:25359: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25379 "configure"
+#line 25366 "configure"
 #include "confdefs.h"
 
 int
@@ -25388,16 +25375,16 @@ long long foo = 123456789123456789LL
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25391: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25394: \$? = $ac_status" >&5
+  echo "$as_me:25381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25400: \$? = $ac_status" >&5
+  echo "$as_me:25387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_long_long=yes
 else
@@ -25408,7 +25395,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25411: result: $cf_cv_type_long_long" >&5
+echo "$as_me:25398: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -25418,14 +25405,14 @@ EOF
 
 fi
 
-echo "$as_me:25421: checking for tm.tm_gmtoff" >&5
+echo "$as_me:25408: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25428 "configure"
+#line 25415 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -25450,16 +25437,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25456: \$? = $ac_status" >&5
+  echo "$as_me:25443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25462: \$? = $ac_status" >&5
+  echo "$as_me:25449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -25470,19 +25457,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25473: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:25460: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:25479: checking for int" >&5
+echo "$as_me:25466: 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 25485 "configure"
+#line 25472 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25497,16 +25484,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25487: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25503: \$? = $ac_status" >&5
+  echo "$as_me:25490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25509: \$? = $ac_status" >&5
+  echo "$as_me:25496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -25516,10 +25503,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25519: result: $ac_cv_type_int" >&5
+echo "$as_me:25506: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:25522: checking size of int" >&5
+echo "$as_me:25509: 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
@@ -25528,7 +25515,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 25531 "configure"
+#line 25518 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25540,21 +25527,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25546: \$? = $ac_status" >&5
+  echo "$as_me:25533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25552: \$? = $ac_status" >&5
+  echo "$as_me:25539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25557 "configure"
+#line 25544 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25566,16 +25553,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25572: \$? = $ac_status" >&5
+  echo "$as_me:25559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25578: \$? = $ac_status" >&5
+  echo "$as_me:25565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -25591,7 +25578,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25594 "configure"
+#line 25581 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25603,16 +25590,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25609: \$? = $ac_status" >&5
+  echo "$as_me:25596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25615: \$? = $ac_status" >&5
+  echo "$as_me:25602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -25628,7 +25615,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 25631 "configure"
+#line 25618 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25640,16 +25627,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25630: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25646: \$? = $ac_status" >&5
+  echo "$as_me:25633: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25652: \$? = $ac_status" >&5
+  echo "$as_me:25639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -25662,12 +25649,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:25665: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:25652: 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 25670 "configure"
+#line 25657 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25683,15 +25670,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25686: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25689: \$? = $ac_status" >&5
+  echo "$as_me:25676: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25694: \$? = $ac_status" >&5
+  echo "$as_me:25681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -25707,19 +25694,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:25710: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:25697: 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:25716: checking for long" >&5
+echo "$as_me:25703: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25722 "configure"
+#line 25709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25734,16 +25721,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25737: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25740: \$? = $ac_status" >&5
+  echo "$as_me:25727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25746: \$? = $ac_status" >&5
+  echo "$as_me:25733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -25753,10 +25740,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25756: result: $ac_cv_type_long" >&5
+echo "$as_me:25743: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:25759: checking size of long" >&5
+echo "$as_me:25746: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25765,7 +25752,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 25768 "configure"
+#line 25755 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25777,21 +25764,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25783: \$? = $ac_status" >&5
+  echo "$as_me:25770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25789: \$? = $ac_status" >&5
+  echo "$as_me:25776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25794 "configure"
+#line 25781 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25803,16 +25790,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25809: \$? = $ac_status" >&5
+  echo "$as_me:25796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25815: \$? = $ac_status" >&5
+  echo "$as_me:25802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -25828,7 +25815,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 25831 "configure"
+#line 25818 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25840,16 +25827,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25846: \$? = $ac_status" >&5
+  echo "$as_me:25833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25852: \$? = $ac_status" >&5
+  echo "$as_me:25839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -25865,7 +25852,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 25868 "configure"
+#line 25855 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25877,16 +25864,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25883: \$? = $ac_status" >&5
+  echo "$as_me:25870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25889: \$? = $ac_status" >&5
+  echo "$as_me:25876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -25899,12 +25886,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:25902: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:25889: 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 25907 "configure"
+#line 25894 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25920,15 +25907,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25926: \$? = $ac_status" >&5
+  echo "$as_me:25913: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25931: \$? = $ac_status" >&5
+  echo "$as_me:25918: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -25944,19 +25931,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:25947: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:25934: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:25953: checking for off_t" >&5
+echo "$as_me:25940: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25959 "configure"
+#line 25946 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25971,16 +25958,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25961: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25977: \$? = $ac_status" >&5
+  echo "$as_me:25964: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25967: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25983: \$? = $ac_status" >&5
+  echo "$as_me:25970: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -25990,10 +25977,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25993: result: $ac_cv_type_off_t" >&5
+echo "$as_me:25980: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:25996: checking size of off_t" >&5
+echo "$as_me:25983: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26002,7 +25989,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26005 "configure"
+#line 25992 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26014,21 +26001,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26031 "configure"
+#line 26018 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26040,16 +26027,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26043: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26046: \$? = $ac_status" >&5
+  echo "$as_me:26033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26052: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26065,7 +26052,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26068 "configure"
+#line 26055 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26077,16 +26064,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26083: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26089: \$? = $ac_status" >&5
+  echo "$as_me:26076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26102,7 +26089,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 26105 "configure"
+#line 26092 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26114,16 +26101,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26120: \$? = $ac_status" >&5
+  echo "$as_me:26107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26126: \$? = $ac_status" >&5
+  echo "$as_me:26113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26136,12 +26123,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26139: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26126: 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 26144 "configure"
+#line 26131 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26157,15 +26144,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26163: \$? = $ac_status" >&5
+  echo "$as_me:26150: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26168: \$? = $ac_status" >&5
+  echo "$as_me:26155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -26181,19 +26168,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:26184: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:26171: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:26190: checking for time_t" >&5
+echo "$as_me:26177: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26196 "configure"
+#line 26183 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26208,16 +26195,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26214: \$? = $ac_status" >&5
+  echo "$as_me:26201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26220: \$? = $ac_status" >&5
+  echo "$as_me:26207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -26227,10 +26214,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26230: result: $ac_cv_type_time_t" >&5
+echo "$as_me:26217: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:26233: checking size of time_t" >&5
+echo "$as_me:26220: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26239,7 +26226,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26242 "configure"
+#line 26229 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26251,21 +26238,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26257: \$? = $ac_status" >&5
+  echo "$as_me:26244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26263: \$? = $ac_status" >&5
+  echo "$as_me:26250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26268 "configure"
+#line 26255 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26277,16 +26264,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26283: \$? = $ac_status" >&5
+  echo "$as_me:26270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26289: \$? = $ac_status" >&5
+  echo "$as_me:26276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26302,7 +26289,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26305 "configure"
+#line 26292 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26314,16 +26301,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26320: \$? = $ac_status" >&5
+  echo "$as_me:26307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26326: \$? = $ac_status" >&5
+  echo "$as_me:26313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26339,7 +26326,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 26342 "configure"
+#line 26329 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26351,16 +26338,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26357: \$? = $ac_status" >&5
+  echo "$as_me:26344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26363: \$? = $ac_status" >&5
+  echo "$as_me:26350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26373,12 +26360,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26376: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26363: 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 26381 "configure"
+#line 26368 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26394,15 +26381,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26400: \$? = $ac_status" >&5
+  echo "$as_me:26387: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26405: \$? = $ac_status" >&5
+  echo "$as_me:26392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -26418,7 +26405,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:26421: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:26408: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -26426,13 +26413,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:26429: checking for working alloca.h" >&5
+echo "$as_me:26416: checking for working alloca.h" >&5
 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
 if test "${ac_cv_working_alloca_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26435 "configure"
+#line 26422 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -26444,16 +26431,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26450: \$? = $ac_status" >&5
+  echo "$as_me:26437: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26456: \$? = $ac_status" >&5
+  echo "$as_me:26443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -26463,7 +26450,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26466: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:26453: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
 if test $ac_cv_working_alloca_h = yes; then
 
@@ -26473,13 +26460,13 @@ EOF
 
 fi
 
-echo "$as_me:26476: checking for alloca" >&5
+echo "$as_me:26463: checking for alloca" >&5
 echo $ECHO_N "checking for alloca... $ECHO_C" >&6
 if test "${ac_cv_func_alloca_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26482 "configure"
+#line 26469 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -26511,16 +26498,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26517: \$? = $ac_status" >&5
+  echo "$as_me:26504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26523: \$? = $ac_status" >&5
+  echo "$as_me:26510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -26530,7 +26517,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26533: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:26520: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
 
 if test $ac_cv_func_alloca_works = yes; then
@@ -26551,13 +26538,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:26554: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:26541: checking whether \`alloca.c' needs Cray hooks" >&5
 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
 if test "${ac_cv_os_cray+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26560 "configure"
+#line 26547 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -26575,18 +26562,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:26578: result: $ac_cv_os_cray" >&5
+echo "$as_me:26565: result: $ac_cv_os_cray" >&5
 echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:26583: checking for $ac_func" >&5
+echo "$as_me:26570: 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 26589 "configure"
+#line 26576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -26617,16 +26604,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26623: \$? = $ac_status" >&5
+  echo "$as_me:26610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26629: \$? = $ac_status" >&5
+  echo "$as_me:26616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -26636,7 +26623,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26639: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:26626: 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
 
@@ -26650,7 +26637,7 @@ fi
   done
 fi
 
-echo "$as_me:26653: checking stack direction for C alloca" >&5
+echo "$as_me:26640: checking stack direction for C alloca" >&5
 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
 if test "${ac_cv_c_stack_direction+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26659,7 +26646,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26662 "configure"
+#line 26649 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -26682,15 +26669,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26688: \$? = $ac_status" >&5
+  echo "$as_me:26675: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26693: \$? = $ac_status" >&5
+  echo "$as_me:26680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -26702,7 +26689,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:26705: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:26692: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -26714,23 +26701,23 @@ fi
 for ac_header in unistd.h vfork.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26717: checking for $ac_header" >&5
+echo "$as_me:26704: 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 26723 "configure"
+#line 26710 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26727: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26714: \"$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:26733: \$? = $ac_status" >&5
+  echo "$as_me:26720: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26749,7 +26736,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26752: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26739: 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
@@ -26762,13 +26749,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:26765: checking for $ac_func" >&5
+echo "$as_me:26752: 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 26771 "configure"
+#line 26758 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -26799,16 +26786,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26805: \$? = $ac_status" >&5
+  echo "$as_me:26792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26811: \$? = $ac_status" >&5
+  echo "$as_me:26798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -26818,7 +26805,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:26821: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:26808: 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
@@ -26830,7 +26817,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:26833: checking for working fork" >&5
+  echo "$as_me:26820: checking for working fork" >&5
 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
 if test "${ac_cv_func_fork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26853,15 +26840,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26859: \$? = $ac_status" >&5
+  echo "$as_me:26846: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26864: \$? = $ac_status" >&5
+  echo "$as_me:26851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -26873,7 +26860,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:26876: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:26863: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -26887,12 +26874,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:26890: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:26877: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:26895: checking for working vfork" >&5
+  echo "$as_me:26882: checking for working vfork" >&5
 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
 if test "${ac_cv_func_vfork_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26901,7 +26888,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26904 "configure"
+#line 26891 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -26998,15 +26985,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27004: \$? = $ac_status" >&5
+  echo "$as_me:26991: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27009: \$? = $ac_status" >&5
+  echo "$as_me:26996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -27018,13 +27005,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27021: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:27008: result: $ac_cv_func_vfork_works" >&5
 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=ac_cv_func_vfork
-  { echo "$as_me:27027: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27014: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
 
@@ -27049,14 +27036,14 @@ EOF
 
 fi
 
-echo "$as_me:27052: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:27039: checking if we should use fcntl or ioctl" >&5
 echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
 if test "${cf_cv_fionbio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27059 "configure"
+#line 27046 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27073,16 +27060,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27079: \$? = $ac_status" >&5
+  echo "$as_me:27066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27085: \$? = $ac_status" >&5
+  echo "$as_me:27072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -27090,7 +27077,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27093 "configure"
+#line 27080 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27112,16 +27099,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27118: \$? = $ac_status" >&5
+  echo "$as_me:27105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27124: \$? = $ac_status" >&5
+  echo "$as_me:27111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -27134,20 +27121,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27137: result: $cf_cv_fionbio" >&5
+echo "$as_me:27124: result: $cf_cv_fionbio" >&5
 echo "${ECHO_T}$cf_cv_fionbio" >&6
 test "$cf_cv_fionbio" = "fcntl" && cat >>confdefs.h <<\EOF
 #define USE_FCNTL 1
 EOF
 
-echo "$as_me:27143: checking for broken/missing definition of remove" >&5
+echo "$as_me:27130: checking for broken/missing definition of remove" >&5
 echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
 if test "${cf_cv_baddef_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27150 "configure"
+#line 27137 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27159,23 +27146,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27165: \$? = $ac_status" >&5
+  echo "$as_me:27152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27171: \$? = $ac_status" >&5
+  echo "$as_me:27158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 27178 "configure"
+#line 27165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -27188,16 +27175,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27194: \$? = $ac_status" >&5
+  echo "$as_me:27181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27200: \$? = $ac_status" >&5
+  echo "$as_me:27187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -27212,20 +27199,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27215: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:27202: result: $cf_cv_baddef_remove" >&5
 echo "${ECHO_T}$cf_cv_baddef_remove" >&6
 test "$cf_cv_baddef_remove" != no && cat >>confdefs.h <<\EOF
 #define NEED_REMOVE 1
 EOF
 
-echo "$as_me:27221: checking for lstat" >&5
+echo "$as_me:27208: checking for lstat" >&5
 echo $ECHO_N "checking for lstat... $ECHO_C" >&6
 if test "${ac_cv_func_lstat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27228 "configure"
+#line 27215 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27239,16 +27226,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27242: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27245: \$? = $ac_status" >&5
+  echo "$as_me:27232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27251: \$? = $ac_status" >&5
+  echo "$as_me:27238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -27260,7 +27247,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27263: result: $ac_cv_func_lstat " >&5
+echo "$as_me:27250: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -27294,13 +27281,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27297: checking for $ac_func" >&5
+echo "$as_me:27284: 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 27303 "configure"
+#line 27290 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27331,16 +27318,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27337: \$? = $ac_status" >&5
+  echo "$as_me:27324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27343: \$? = $ac_status" >&5
+  echo "$as_me:27330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27350,7 +27337,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27353: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27340: 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
@@ -27366,13 +27353,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27369: checking for $ac_func" >&5
+echo "$as_me:27356: 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 27375 "configure"
+#line 27362 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27403,16 +27390,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27409: \$? = $ac_status" >&5
+  echo "$as_me:27396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27415: \$? = $ac_status" >&5
+  echo "$as_me:27402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27422,7 +27409,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27425: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27412: 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
@@ -27434,7 +27421,7 @@ else
 fi
 done
 
-echo "$as_me:27437: checking for random-integer functions" >&5
+echo "$as_me:27424: checking for random-integer functions" >&5
 echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
 if test "${cf_cv_srand_func+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27454,7 +27441,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27457 "configure"
+#line 27444 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -27473,16 +27460,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27479: \$? = $ac_status" >&5
+  echo "$as_me:27466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27485: \$? = $ac_status" >&5
+  echo "$as_me:27472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -27494,10 +27481,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:27497: result: $cf_cv_srand_func" >&5
+echo "$as_me:27484: result: $cf_cv_srand_func" >&5
 echo "${ECHO_T}$cf_cv_srand_func" >&6
 if test "$cf_cv_srand_func" != unknown ; then
-	echo "$as_me:27500: checking for range of random-integers" >&5
+	echo "$as_me:27487: checking for range of random-integers" >&5
 echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
 if test "${cf_cv_rand_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27518,7 +27505,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 27521 "configure"
+#line 27508 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -27537,16 +27524,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27540: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27543: \$? = $ac_status" >&5
+  echo "$as_me:27530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27546: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27549: \$? = $ac_status" >&5
+  echo "$as_me:27536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27557,7 +27544,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:27560: result: $cf_cv_rand_max" >&5
+echo "$as_me:27547: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -27588,13 +27575,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:27591: checking for $ac_func declaration" >&5
+echo "$as_me:27578: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27597 "configure"
+#line 27584 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -27608,20 +27595,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27614: \$? = $ac_status" >&5
+  echo "$as_me:27601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27620: \$? = $ac_status" >&5
+  echo "$as_me:27607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27624 "configure"
+#line 27611 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -27635,16 +27622,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27641: \$? = $ac_status" >&5
+  echo "$as_me:27628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27647: \$? = $ac_status" >&5
+  echo "$as_me:27634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -27665,11 +27652,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:27668: result: yes" >&5
+  echo "$as_me:27655: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:27672: result: no" >&5
+  echo "$as_me:27659: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -27684,13 +27671,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:27687: checking for $ac_func declaration" >&5
+echo "$as_me:27674: checking for $ac_func declaration" >&5
 echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
 if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27693 "configure"
+#line 27680 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27706,20 +27693,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27712: \$? = $ac_status" >&5
+  echo "$as_me:27699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27718: \$? = $ac_status" >&5
+  echo "$as_me:27705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27722 "configure"
+#line 27709 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27735,16 +27722,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27741: \$? = $ac_status" >&5
+  echo "$as_me:27728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27747: \$? = $ac_status" >&5
+  echo "$as_me:27734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -27765,11 +27752,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
-  echo "$as_me:27768: result: yes" >&5
+  echo "$as_me:27755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:27772: result: no" >&5
+  echo "$as_me:27759: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -27781,14 +27768,14 @@ EOF
 fi
 done
 
-echo "$as_me:27784: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:27771: checking if TRUE/FALSE are defined" >&5
 echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
 if test "${cf_cv_bool_defs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27791 "configure"
+#line 27778 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -27802,16 +27789,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27792: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27808: \$? = $ac_status" >&5
+  echo "$as_me:27795: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27814: \$? = $ac_status" >&5
+  echo "$as_me:27801: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -27822,7 +27809,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27825: result: $cf_cv_bool_defs" >&5
+echo "$as_me:27812: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -27835,14 +27822,14 @@ EOF
 
 fi
 
-echo "$as_me:27838: checking if external errno is declared" >&5
+echo "$as_me:27825: checking if external errno is declared" >&5
 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 27845 "configure"
+#line 27832 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -27860,16 +27847,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27866: \$? = $ac_status" >&5
+  echo "$as_me:27853: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27872: \$? = $ac_status" >&5
+  echo "$as_me:27859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -27880,7 +27867,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:27883: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:27870: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -27895,14 +27882,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:27898: checking if external errno exists" >&5
+echo "$as_me:27885: checking if external errno exists" >&5
 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 27905 "configure"
+#line 27892 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -27917,16 +27904,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27923: \$? = $ac_status" >&5
+  echo "$as_me:27910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27929: \$? = $ac_status" >&5
+  echo "$as_me:27916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -27937,7 +27924,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27940: result: $cf_cv_have_errno" >&5
+echo "$as_me:27927: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -27950,7 +27937,7 @@ EOF
 
 fi
 
-echo "$as_me:27953: checking if we can set errno" >&5
+echo "$as_me:27940: checking if we can set errno" >&5
 echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
 if test "${cf_cv_set_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27958,7 +27945,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 27961 "configure"
+#line 27948 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -27970,16 +27957,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27973: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27976: \$? = $ac_status" >&5
+  echo "$as_me:27963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27982: \$? = $ac_status" >&5
+  echo "$as_me:27969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -27990,7 +27977,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27993 "configure"
+#line 27980 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -28001,15 +27988,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28007: \$? = $ac_status" >&5
+  echo "$as_me:27994: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28012: \$? = $ac_status" >&5
+  echo "$as_me:27999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -28022,20 +28009,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:28025: result: $cf_cv_set_errno" >&5
+echo "$as_me:28012: result: $cf_cv_set_errno" >&5
 echo "${ECHO_T}$cf_cv_set_errno" >&6
 test "$cf_cv_set_errno" != no && cat >>confdefs.h <<\EOF
 #define CAN_SET_ERRNO 1
 EOF
 
-echo "$as_me:28031: checking for setlocale()" >&5
+echo "$as_me:28018: checking for setlocale()" >&5
 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
 if test "${cf_cv_locale+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28038 "configure"
+#line 28025 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -28047,16 +28034,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28053: \$? = $ac_status" >&5
+  echo "$as_me:28040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28059: \$? = $ac_status" >&5
+  echo "$as_me:28046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -28068,21 +28055,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28071: result: $cf_cv_locale" >&5
+echo "$as_me:28058: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:28078: checking if NGROUPS is defined" >&5
+echo "$as_me:28065: checking if NGROUPS is defined" >&5
 echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
 if test "${cf_cv_ngroups+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28085 "configure"
+#line 28072 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28101,23 +28088,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28107: \$? = $ac_status" >&5
+  echo "$as_me:28094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28113: \$? = $ac_status" >&5
+  echo "$as_me:28100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 28120 "configure"
+#line 28107 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28136,16 +28123,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28139: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28126: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28142: \$? = $ac_status" >&5
+  echo "$as_me:28129: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28148: \$? = $ac_status" >&5
+  echo "$as_me:28135: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -28157,7 +28144,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:28160: result: $cf_cv_ngroups" >&5
+echo "$as_me:28147: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -28174,14 +28161,14 @@ EOF
 
 fi
 
-echo "$as_me:28177: checking if external sys_nerr is declared" >&5
+echo "$as_me:28164: checking if external sys_nerr is declared" >&5
 echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 28184 "configure"
+#line 28171 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28199,16 +28186,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28189: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28205: \$? = $ac_status" >&5
+  echo "$as_me:28192: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28211: \$? = $ac_status" >&5
+  echo "$as_me:28198: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -28219,7 +28206,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28222: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:28209: result: $cf_cv_dcl_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
 
 if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -28234,14 +28221,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28237: checking if external sys_nerr exists" >&5
+echo "$as_me:28224: checking if external sys_nerr exists" >&5
 echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_nerr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 28244 "configure"
+#line 28231 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -28256,16 +28243,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28262: \$? = $ac_status" >&5
+  echo "$as_me:28249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28268: \$? = $ac_status" >&5
+  echo "$as_me:28255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -28276,7 +28263,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28279: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:28266: result: $cf_cv_have_sys_nerr" >&5
 echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
 
 if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -28289,14 +28276,14 @@ EOF
 
 fi
 
-echo "$as_me:28292: checking if external sys_errlist is declared" >&5
+echo "$as_me:28279: checking if external sys_errlist is declared" >&5
 echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
 if test "${cf_cv_dcl_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 28299 "configure"
+#line 28286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28314,16 +28301,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28320: \$? = $ac_status" >&5
+  echo "$as_me:28307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28326: \$? = $ac_status" >&5
+  echo "$as_me:28313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -28334,7 +28321,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28337: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:28324: result: $cf_cv_dcl_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
 
 if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -28349,14 +28336,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28352: checking if external sys_errlist exists" >&5
+echo "$as_me:28339: checking if external sys_errlist exists" >&5
 echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
 if test "${cf_cv_have_sys_errlist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 28359 "configure"
+#line 28346 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -28371,16 +28358,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28377: \$? = $ac_status" >&5
+  echo "$as_me:28364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28383: \$? = $ac_status" >&5
+  echo "$as_me:28370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -28391,7 +28378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28394: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:28381: result: $cf_cv_have_sys_errlist" >&5
 echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
 
 if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -28407,23 +28394,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:28410: checking for $ac_header" >&5
+echo "$as_me:28397: 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 28416 "configure"
+#line 28403 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28420: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28407: \"$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:28426: \$? = $ac_status" >&5
+  echo "$as_me:28413: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28442,7 +28429,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28445: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28432: 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
@@ -28452,14 +28439,14 @@ EOF
 fi
 done
 
-echo "$as_me:28455: checking for lastlog path" >&5
+echo "$as_me:28442: checking for lastlog path" >&5
 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
 if test "${cf_cv_path_lastlog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28462 "configure"
+#line 28449 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28479,16 +28466,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28485: \$? = $ac_status" >&5
+  echo "$as_me:28472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28491: \$? = $ac_status" >&5
+  echo "$as_me:28478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -28503,13 +28490,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28506: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:28493: result: $cf_cv_path_lastlog" >&5
 echo "${ECHO_T}$cf_cv_path_lastlog" >&6
 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF
 #define USE_LASTLOG 1
 EOF
 
-echo "$as_me:28512: checking for utmp implementation" >&5
+echo "$as_me:28499: checking for utmp implementation" >&5
 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
 if test "${cf_cv_have_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28526,7 +28513,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28529 "configure"
+#line 28516 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -28540,16 +28527,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28546: \$? = $ac_status" >&5
+  echo "$as_me:28533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28552: \$? = $ac_status" >&5
+  echo "$as_me:28539: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -28558,7 +28545,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28561 "configure"
+#line 28548 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -28572,16 +28559,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28578: \$? = $ac_status" >&5
+  echo "$as_me:28565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28584: \$? = $ac_status" >&5
+  echo "$as_me:28571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -28596,7 +28583,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28599: result: $cf_cv_have_utmp" >&5
+echo "$as_me:28586: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -28609,14 +28596,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28612: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:28599: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28619 "configure"
+#line 28606 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28630,16 +28617,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28620: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28636: \$? = $ac_status" >&5
+  echo "$as_me:28623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28642: \$? = $ac_status" >&5
+  echo "$as_me:28629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -28651,7 +28638,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28654: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:28641: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -28660,14 +28647,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28663: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:28650: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28670 "configure"
+#line 28657 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28681,16 +28668,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28687: \$? = $ac_status" >&5
+  echo "$as_me:28674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28693: \$? = $ac_status" >&5
+  echo "$as_me:28680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -28702,7 +28689,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28705: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:28692: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -28711,7 +28698,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28714: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:28701: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_name+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28728,7 +28715,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28731 "configure"
+#line 28718 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -28742,16 +28729,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28732: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28748: \$? = $ac_status" >&5
+  echo "$as_me:28735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28754: \$? = $ac_status" >&5
+  echo "$as_me:28741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -28763,12 +28750,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28766: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:28753: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:28771: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:28758: error: Cannot find declaration for ut.ut_name" >&5
 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -28782,7 +28769,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28785: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:28772: checking for exit-status in $cf_cv_have_utmp" >&5
 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28795,7 +28782,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 28798 "configure"
+#line 28785 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28809,16 +28796,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28815: \$? = $ac_status" >&5
+  echo "$as_me:28802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28821: \$? = $ac_status" >&5
+  echo "$as_me:28808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -28831,7 +28818,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28834: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:28821: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -28846,14 +28833,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28849: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:28836: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28856 "configure"
+#line 28843 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28867,23 +28854,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28870: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28873: \$? = $ac_status" >&5
+  echo "$as_me:28860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28879: \$? = $ac_status" >&5
+  echo "$as_me:28866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 28886 "configure"
+#line 28873 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28897,16 +28884,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28903: \$? = $ac_status" >&5
+  echo "$as_me:28890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28909: \$? = $ac_status" >&5
+  echo "$as_me:28896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -28920,7 +28907,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28923: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:28910: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -28937,14 +28924,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:28940: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:28927: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_session+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 28947 "configure"
+#line 28934 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28958,16 +28945,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28948: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28964: \$? = $ac_status" >&5
+  echo "$as_me:28951: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28970: \$? = $ac_status" >&5
+  echo "$as_me:28957: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -28978,7 +28965,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28981: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:28968: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -28988,7 +28975,7 @@ EOF
 fi
 fi
 
-echo "$as_me:28991: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:28978: checking if $cf_cv_have_utmp is SYSV flavor" >&5
 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
 if test "${cf_cv_sysv_utmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28996,7 +28983,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 28999 "configure"
+#line 28986 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29015,16 +29002,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29021: \$? = $ac_status" >&5
+  echo "$as_me:29008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29027: \$? = $ac_status" >&5
+  echo "$as_me:29014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -29035,7 +29022,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29038: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:29025: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -29043,14 +29030,14 @@ EOF
 
 fi
 
-echo "$as_me:29046: checking if external h_errno exists" >&5
+echo "$as_me:29033: checking if external h_errno exists" >&5
 echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
 if test "${cf_cv_have_h_errno+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 29053 "configure"
+#line 29040 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -29065,16 +29052,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29068: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29071: \$? = $ac_status" >&5
+  echo "$as_me:29058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29077: \$? = $ac_status" >&5
+  echo "$as_me:29064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -29085,7 +29072,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29088: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:29075: result: $cf_cv_have_h_errno" >&5
 echo "${ECHO_T}$cf_cv_have_h_errno" >&6
 
 if test "$cf_cv_have_h_errno" = yes ; then
@@ -29098,7 +29085,7 @@ EOF
 
 fi
 
-echo "$as_me:29101: checking if bibp: URLs should be supported" >&5
+echo "$as_me:29088: checking if bibp: URLs should be supported" >&5
 echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
 
 # Check whether --enable-bibp-urls or --disable-bibp-urls was given.
@@ -29115,13 +29102,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:29118: result: $use_bibp_urls" >&5
+echo "$as_me:29105: result: $use_bibp_urls" >&5
 echo "${ECHO_T}$use_bibp_urls" >&6
 test $use_bibp_urls = no && cat >>confdefs.h <<\EOF
 #define DISABLE_BIBP 1
 EOF
 
-echo "$as_me:29124: checking if configuration info should be browsable" >&5
+echo "$as_me:29111: checking if configuration info should be browsable" >&5
 echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
 
 # Check whether --enable-config-info or --disable-config-info was given.
@@ -29138,13 +29125,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:29141: result: $use_config_info" >&5
+echo "$as_me:29128: result: $use_config_info" >&5
 echo "${ECHO_T}$use_config_info" >&6
 test $use_config_info = no && cat >>confdefs.h <<\EOF
 #define NO_CONFIG_INFO 1
 EOF
 
-echo "$as_me:29147: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:29134: checking if new-style forms-based options screen should be used" >&5
 echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
 
 # Check whether --enable-forms-options or --disable-forms-options was given.
@@ -29161,13 +29148,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:29164: result: $use_forms_options" >&5
+echo "$as_me:29151: result: $use_forms_options" >&5
 echo "${ECHO_T}$use_forms_options" >&6
 test $use_forms_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_FORMS 1
 EOF
 
-echo "$as_me:29170: checking if old-style options menu should be used" >&5
+echo "$as_me:29157: checking if old-style options menu should be used" >&5
 echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
 
 # Check whether --enable-menu-options or --disable-menu-options was given.
@@ -29184,13 +29171,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:29187: result: $use_menu_options" >&5
+echo "$as_me:29174: result: $use_menu_options" >&5
 echo "${ECHO_T}$use_menu_options" >&6
 test $use_menu_options = no && cat >>confdefs.h <<\EOF
 #define NO_OPTION_MENU 1
 EOF
 
-echo "$as_me:29193: checking if sessions code should be used" >&5
+echo "$as_me:29180: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -29207,7 +29194,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:29210: result: $use_sessions" >&5
+echo "$as_me:29197: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29217,7 +29204,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:29220: checking if session-caching code should be used" >&5
+echo "$as_me:29207: checking if session-caching code should be used" >&5
 echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
 
 # Check whether --enable-session-cache or --disable-session-cache was given.
@@ -29234,7 +29221,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:29237: result: $use_session_cache" >&5
+echo "$as_me:29224: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -29243,7 +29230,7 @@ EOF
 
 fi
 
-echo "$as_me:29246: checking if experimental address-list page should be used" >&5
+echo "$as_me:29233: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -29260,13 +29247,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:29263: result: $use_addrlist_page" >&5
+echo "$as_me:29250: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:29269: checking if experimental CJK logic should be used" >&5
+echo "$as_me:29256: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -29283,13 +29270,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:29286: result: $use_cjk" >&5
+echo "$as_me:29273: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no && cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:29292: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:29279: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -29306,7 +29293,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:29309: result: $use_ja_utf8" >&5
+echo "$as_me:29296: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29351,7 +29338,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29354 "configure"
+#line 29341 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29363,16 +29350,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29369: \$? = $ac_status" >&5
+  echo "$as_me:29356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29375: \$? = $ac_status" >&5
+  echo "$as_me:29362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29389,7 +29376,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:29392: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29379: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29430,7 +29417,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29433 "configure"
+#line 29420 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29442,16 +29429,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29445: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29448: \$? = $ac_status" >&5
+  echo "$as_me:29435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29454: \$? = $ac_status" >&5
+  echo "$as_me:29441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29468,7 +29455,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:29471: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29458: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29484,7 +29471,7 @@ echo "${as_me-configure}:29471: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:29487: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:29474: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29509,7 +29496,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:29512: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29499: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29538,7 +29525,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:29541: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29528: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29547,7 +29534,7 @@ echo "${as_me-configure}:29541: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:29550: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:29537: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29558,7 +29545,7 @@ done
 
 fi;
 
-  echo "$as_me:29561: checking for iconv" >&5
+  echo "$as_me:29548: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29569,12 +29556,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:29572: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:29559: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29577 "configure"
+#line 29564 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29593,16 +29580,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29599: \$? = $ac_status" >&5
+  echo "$as_me:29586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29605: \$? = $ac_status" >&5
+  echo "$as_me:29592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -29616,7 +29603,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29619 "configure"
+#line 29606 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29635,16 +29622,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29641: \$? = $ac_status" >&5
+  echo "$as_me:29628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29647: \$? = $ac_status" >&5
+  echo "$as_me:29634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -29661,9 +29648,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:29664: testing find linkage for iconv library ..." 1>&5
+echo "${as_me-configure}:29651: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:29666: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:29653: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29776,11 +29763,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:29779: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:29766: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 29783 "configure"
+#line 29770 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29799,21 +29786,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29789: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29805: \$? = $ac_status" >&5
+  echo "$as_me:29792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29811: \$? = $ac_status" >&5
+  echo "$as_me:29798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:29816: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:29803: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29831,7 +29818,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:29834: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:29821: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -29928,13 +29915,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:29931: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:29918: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 29937 "configure"
+#line 29924 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -29953,21 +29940,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29959: \$? = $ac_status" >&5
+  echo "$as_me:29946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29965: \$? = $ac_status" >&5
+  echo "$as_me:29952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:29970: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:29957: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -30007,7 +29994,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:30010: result: $am_cv_func_iconv" >&5
+echo "$as_me:29997: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -30016,14 +30003,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:30019: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:30006: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 30026 "configure"
+#line 30013 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30048,16 +30035,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30054: \$? = $ac_status" >&5
+  echo "$as_me:30041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30060: \$? = $ac_status" >&5
+  echo "$as_me:30047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -30067,7 +30054,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:30070: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:30057: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -30109,7 +30096,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30112 "configure"
+#line 30099 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30121,16 +30108,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30124: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30127: \$? = $ac_status" >&5
+  echo "$as_me:30114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30133: \$? = $ac_status" >&5
+  echo "$as_me:30120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30147,7 +30134,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30150: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:30137: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30184,7 +30171,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30187: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:30174: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30208,7 +30195,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:30211: checking if you want to use default-colors" >&5
+echo "$as_me:30198: checking if you want to use default-colors" >&5
 echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
 
 # Check whether --enable-default-colors or --disable-default-colors was given.
@@ -30225,7 +30212,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:30228: result: $use_dft_colors" >&5
+echo "$as_me:30215: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -30233,7 +30220,7 @@ EOF
 
 fi
 
-echo "$as_me:30236: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:30223: checking if experimental keyboard-layout logic should be used" >&5
 echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-kbd-layout or --disable-kbd-layout was given.
@@ -30250,13 +30237,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:30253: result: $use_kbd_layout" >&5
+echo "$as_me:30240: result: $use_kbd_layout" >&5
 echo "${ECHO_T}$use_kbd_layout" >&6
 test $use_kbd_layout != no && cat >>confdefs.h <<\EOF
 #define EXP_KEYBOARD_LAYOUT 1
 EOF
 
-echo "$as_me:30259: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:30246: checking if experimental nested-table logic should be used" >&5
 echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-nested-tables or --disable-nested-tables was given.
@@ -30273,13 +30260,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:30276: result: $use_nested_tables" >&5
+echo "$as_me:30263: result: $use_nested_tables" >&5
 echo "${ECHO_T}$use_nested_tables" >&6
 test $use_nested_tables != no && cat >>confdefs.h <<\EOF
 #define EXP_NESTED_TABLES 1
 EOF
 
-echo "$as_me:30282: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:30269: checking if alternative line-edit bindings should be used" >&5
 echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
 
 # Check whether --enable-alt-bindings or --disable-alt-bindings was given.
@@ -30296,13 +30283,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:30299: result: $use_alt_bindings" >&5
+echo "$as_me:30286: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:30305: checking if ascii case-conversion should be used" >&5
+echo "$as_me:30292: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -30319,13 +30306,13 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:30322: result: $use_ascii_ctypes" >&5
+echo "$as_me:30309: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no && cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:30328: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:30315: checking if you want to use extended HTML DTD logic" >&5
 echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
 
 # Check whether --enable-extended-dtd or --disable-extended-dtd was given.
@@ -30342,13 +30329,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:30345: result: $use_ext_htmldtd" >&5
+echo "$as_me:30332: result: $use_ext_htmldtd" >&5
 echo "${ECHO_T}$use_ext_htmldtd" >&6
 test $use_ext_htmldtd = "no" && cat >>confdefs.h <<\EOF
 #define NO_EXTENDED_HTMLDTD 1
 EOF
 
-echo "$as_me:30351: checking if file-upload logic should be used" >&5
+echo "$as_me:30338: checking if file-upload logic should be used" >&5
 echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-file-upload or --disable-file-upload was given.
@@ -30365,13 +30352,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:30368: result: $use_file_upload" >&5
+echo "$as_me:30355: result: $use_file_upload" >&5
 echo "${ECHO_T}$use_file_upload" >&6
 test $use_file_upload != no && cat >>confdefs.h <<\EOF
 #define USE_FILE_UPLOAD 1
 EOF
 
-echo "$as_me:30374: checking if IDNA support should be used" >&5
+echo "$as_me:30361: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -30388,7 +30375,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:30391: result: $use_idna" >&5
+echo "$as_me:30378: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -30427,7 +30414,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30430 "configure"
+#line 30417 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30439,16 +30426,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30429: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30445: \$? = $ac_status" >&5
+  echo "$as_me:30432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30451: \$? = $ac_status" >&5
+  echo "$as_me:30438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30465,7 +30452,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30468: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:30455: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30506,7 +30493,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30509 "configure"
+#line 30496 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30518,16 +30505,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30524: \$? = $ac_status" >&5
+  echo "$as_me:30511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30530: \$? = $ac_status" >&5
+  echo "$as_me:30517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30544,7 +30531,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:30547: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:30534: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30560,7 +30547,7 @@ echo "${as_me-configure}:30547: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:30563: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:30550: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30585,7 +30572,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30588: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:30575: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30614,7 +30601,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:30617: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:30604: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30623,7 +30610,7 @@ echo "${as_me-configure}:30617: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:30626: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:30613: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30637,12 +30624,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me-configure}:30640: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me-configure}:30627: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30645 "configure"
+#line 30632 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30660,16 +30647,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30666: \$? = $ac_status" >&5
+  echo "$as_me:30653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30672: \$? = $ac_status" >&5
+  echo "$as_me:30659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -30683,7 +30670,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30686 "configure"
+#line 30673 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30701,16 +30688,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30707: \$? = $ac_status" >&5
+  echo "$as_me:30694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30713: \$? = $ac_status" >&5
+  echo "$as_me:30700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -30727,9 +30714,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me-configure}:30730: testing find linkage for idn library ..." 1>&5
+echo "${as_me-configure}:30717: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me-configure}:30732: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me-configure}:30719: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30842,11 +30829,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_idn ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me-configure}:30845: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me-configure}:30832: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
         cat >conftest.$ac_ext <<_ACEOF
-#line 30849 "configure"
+#line 30836 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30864,21 +30851,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30870: \$? = $ac_status" >&5
+  echo "$as_me:30857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30876: \$? = $ac_status" >&5
+  echo "$as_me:30863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me-configure}:30881: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me-configure}:30868: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30896,7 +30883,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me-configure}:30899: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me-configure}:30886: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -30993,13 +30980,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_idn ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me-configure}:30996: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me-configure}:30983: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lidn  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
             cat >conftest.$ac_ext <<_ACEOF
-#line 31002 "configure"
+#line 30989 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31017,21 +31004,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31023: \$? = $ac_status" >&5
+  echo "$as_me:31010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31029: \$? = $ac_status" >&5
+  echo "$as_me:31016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me-configure}:31034: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me-configure}:31021: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -31090,7 +31077,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31093 "configure"
+#line 31080 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31102,16 +31089,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31108: \$? = $ac_status" >&5
+  echo "$as_me:31095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31114: \$? = $ac_status" >&5
+  echo "$as_me:31101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31128,7 +31115,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:31131: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:31118: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31162,7 +31149,7 @@ if test -n "$cf_cv_library_path_idn" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:31165: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:31152: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31173,7 +31160,7 @@ fi
 	LIBS="-lidn $LIBS"
 
 else
-{ echo "$as_me:31176: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:31163: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -31186,7 +31173,7 @@ fi
 
 fi
 
-echo "$as_me:31189: checking if element-justification logic should be used" >&5
+echo "$as_me:31176: checking if element-justification logic should be used" >&5
 echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -31203,13 +31190,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:31206: result: $use_justify_elts" >&5
+echo "$as_me:31193: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:31212: checking if partial-display should be used" >&5
+echo "$as_me:31199: checking if partial-display should be used" >&5
 echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
 
 # Check whether --enable-partial or --disable-partial was given.
@@ -31226,13 +31213,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:31229: result: $use_partial_display" >&5
+echo "$as_me:31216: result: $use_partial_display" >&5
 echo "${ECHO_T}$use_partial_display" >&6
 test $use_partial_display != no && cat >>confdefs.h <<\EOF
 #define DISP_PARTIAL 1
 EOF
 
-echo "$as_me:31235: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:31222: checking if persistent-cookie logic should be used" >&5
 echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given.
@@ -31249,13 +31236,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:31252: result: $use_filed_cookies" >&5
+echo "$as_me:31239: result: $use_filed_cookies" >&5
 echo "${ECHO_T}$use_filed_cookies" >&6
 test $use_filed_cookies != no && cat >>confdefs.h <<\EOF
 #define USE_PERSISTENT_COOKIES 1
 EOF
 
-echo "$as_me:31258: checking if html source should be colorized" >&5
+echo "$as_me:31245: checking if html source should be colorized" >&5
 echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
 
 # Check whether --enable-prettysrc or --disable-prettysrc was given.
@@ -31272,13 +31259,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:31275: result: $use_prettysrc" >&5
+echo "$as_me:31262: result: $use_prettysrc" >&5
 echo "${ECHO_T}$use_prettysrc" >&6
 test $use_prettysrc != no && cat >>confdefs.h <<\EOF
 #define USE_PRETTYSRC 1
 EOF
 
-echo "$as_me:31281: checking if progress-bar code should be used" >&5
+echo "$as_me:31268: checking if progress-bar code should be used" >&5
 echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-progressbar or --disable-progressbar was given.
@@ -31295,13 +31282,13 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:31298: result: $use_progressbar" >&5
+echo "$as_me:31285: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no && cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:31304: checking if read-progress message should show ETA" >&5
+echo "$as_me:31291: checking if read-progress message should show ETA" >&5
 echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
 
 # Check whether --enable-read-eta or --disable-read-eta was given.
@@ -31318,13 +31305,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:31321: result: $use_read_eta" >&5
+echo "$as_me:31308: result: $use_read_eta" >&5
 echo "${ECHO_T}$use_read_eta" >&6
 test $use_read_eta != no && cat >>confdefs.h <<\EOF
 #define USE_READPROGRESS 1
 EOF
 
-echo "$as_me:31327: checking if source caching should be used" >&5
+echo "$as_me:31314: checking if source caching should be used" >&5
 echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
 
 # Check whether --enable-source-cache or --disable-source-cache was given.
@@ -31341,13 +31328,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:31344: result: $use_source_cache" >&5
+echo "$as_me:31331: result: $use_source_cache" >&5
 echo "${ECHO_T}$use_source_cache" >&6
 test $use_source_cache != no && cat >>confdefs.h <<\EOF
 #define USE_SOURCE_CACHE 1
 EOF
 
-echo "$as_me:31350: checking if scrollbar code should be used" >&5
+echo "$as_me:31337: checking if scrollbar code should be used" >&5
 echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-scrollbar or --disable-scrollbar was given.
@@ -31364,10 +31351,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:31367: result: $use_scrollbar" >&5
+echo "$as_me:31354: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:31370: checking if charset-selection logic should be used" >&5
+echo "$as_me:31357: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -31384,13 +31371,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:31387: result: $use_charset_choice" >&5
+echo "$as_me:31374: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:31393: checking if you want to use external commands" >&5
+echo "$as_me:31380: checking if you want to use external commands" >&5
 echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
 
 # Check whether --enable-externs or --disable-externs was given.
@@ -31407,7 +31394,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:31410: result: $use_externs" >&5
+echo "$as_me:31397: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -31417,7 +31404,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:31420: checking if you want to use setfont support" >&5
+echo "$as_me:31407: checking if you want to use setfont support" >&5
 echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
 
 # Check whether --enable-font-switch or --disable-font-switch was given.
@@ -31434,7 +31421,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:31437: result: $use_setfont" >&5
+echo "$as_me:31424: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -31445,7 +31432,7 @@ for ac_prog in $SETFONT consolechars setfont
 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:31448: checking for $ac_word" >&5
+echo "$as_me:31435: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SETFONT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31462,7 +31449,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_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:31465: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31452: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31473,10 +31460,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:31476: result: $SETFONT" >&5
+  echo "$as_me:31463: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:31479: result: no" >&5
+  echo "$as_me:31466: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31535,7 +31522,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31538: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31525: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -31552,19 +31539,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:31555: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:31542: testing Assume $host_os has font-switching ..." 1>&5
 
 		;;
 	*)
 		SETFONT=unknown
 		test -n "$verbose" && echo "	Assume $host_os has no font-switching" 1>&6
 
-echo "${as_me-configure}:31562: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:31549: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:31567: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:31554: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -31574,7 +31561,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:31577: checking if you want cgi-link support" >&5
+echo "$as_me:31564: checking if you want cgi-link support" >&5
 echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
 
 # Check whether --enable-cgi-links or --disable-cgi-links was given.
@@ -31590,10 +31577,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:31593: result: $enableval" >&5
+echo "$as_me:31580: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:31596: checking if you want change-exec support" >&5
+echo "$as_me:31583: checking if you want change-exec support" >&5
 echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
 
 # Check whether --enable-change-exec or --disable-change-exec was given.
@@ -31610,13 +31597,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:31613: result: $use_change_exec" >&5
+echo "$as_me:31600: result: $use_change_exec" >&5
 echo "${ECHO_T}$use_change_exec" >&6
 test $use_change_exec = yes && cat >>confdefs.h <<\EOF
 #define ENABLE_OPTS_CHANGE_EXEC 1
 EOF
 
-echo "$as_me:31619: checking if you want exec-links support" >&5
+echo "$as_me:31606: checking if you want exec-links support" >&5
 echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
 
 # Check whether --enable-exec-links or --disable-exec-links was given.
@@ -31633,13 +31620,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:31636: result: $use_exec_links" >&5
+echo "$as_me:31623: result: $use_exec_links" >&5
 echo "${ECHO_T}$use_exec_links" >&6
 test $use_exec_links = yes && cat >>confdefs.h <<\EOF
 #define EXEC_LINKS 1
 EOF
 
-echo "$as_me:31642: checking if you want exec-scripts support" >&5
+echo "$as_me:31629: checking if you want exec-scripts support" >&5
 echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
 
 # Check whether --enable-exec-scripts or --disable-exec-scripts was given.
@@ -31656,13 +31643,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:31659: result: $use_exec_scripts" >&5
+echo "$as_me:31646: result: $use_exec_scripts" >&5
 echo "${ECHO_T}$use_exec_scripts" >&6
 test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF
 #define EXEC_SCRIPTS 1
 EOF
 
-echo "$as_me:31665: checking if you want internal-links feature" >&5
+echo "$as_me:31652: checking if you want internal-links feature" >&5
 echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
 
 # Check whether --enable-internal-links or --disable-internal-links was given.
@@ -31679,13 +31666,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:31682: result: $use_internal_links" >&5
+echo "$as_me:31669: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:31688: checking if you want to fork NSL requests" >&5
+echo "$as_me:31675: checking if you want to fork NSL requests" >&5
 echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
 
 # Check whether --enable-nsl-fork or --disable-nsl-fork was given.
@@ -31702,7 +31689,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:31705: result: $use_nsl_fork" >&5
+echo "$as_me:31692: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -31721,7 +31708,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:31724: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:31711: checking if you want to log URL requests via syslog" >&5
 echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6
 
 # Check whether --enable-syslog or --disable-syslog was given.
@@ -31738,13 +31725,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:31741: result: $use_syslog" >&5
+echo "$as_me:31728: result: $use_syslog" >&5
 echo "${ECHO_T}$use_syslog" >&6
 test $use_syslog = yes && cat >>confdefs.h <<\EOF
 #define SYSLOG_REQUESTED_URLS 1
 EOF
 
-echo "$as_me:31747: checking if you want to underline links" >&5
+echo "$as_me:31734: checking if you want to underline links" >&5
 echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
 
 # Check whether --enable-underlines or --disable-underlines was given.
@@ -31761,7 +31748,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:31764: result: $use_underline" >&5
+echo "$as_me:31751: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -31771,7 +31758,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:31774: checking if help files should be gzip'ed" >&5
+echo "$as_me:31761: checking if help files should be gzip'ed" >&5
 echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
 
 # Check whether --enable-gzip-help or --disable-gzip-help was given.
@@ -31788,10 +31775,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:31791: result: $use_gzip_help" >&5
+echo "$as_me:31778: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:31794: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:31781: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
 echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6
 
 # Check whether --with-bzlib or --without-bzlib was given.
@@ -31801,7 +31788,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:31804: result: $use_bzlib" >&5
+echo "$as_me:31791: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -31840,7 +31827,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31843 "configure"
+#line 31830 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31852,16 +31839,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31858: \$? = $ac_status" >&5
+  echo "$as_me:31845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31864: \$? = $ac_status" >&5
+  echo "$as_me:31851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31878,7 +31865,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:31881: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:31868: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31919,7 +31906,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31922 "configure"
+#line 31909 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31931,16 +31918,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31937: \$? = $ac_status" >&5
+  echo "$as_me:31924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31943: \$? = $ac_status" >&5
+  echo "$as_me:31930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31957,7 +31944,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:31960: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:31947: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31973,7 +31960,7 @@ echo "${as_me-configure}:31960: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:31976: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:31963: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31998,7 +31985,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32001: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:31988: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32027,7 +32014,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32030: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:32017: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32036,7 +32023,7 @@ echo "${as_me-configure}:32030: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:32039: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32026: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32050,12 +32037,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:32053: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:32040: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32058 "configure"
+#line 32045 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32072,16 +32059,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32078: \$? = $ac_status" >&5
+  echo "$as_me:32065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32084: \$? = $ac_status" >&5
+  echo "$as_me:32071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32095,7 +32082,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32098 "configure"
+#line 32085 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32112,16 +32099,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32118: \$? = $ac_status" >&5
+  echo "$as_me:32105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32124: \$? = $ac_status" >&5
+  echo "$as_me:32111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32138,9 +32125,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me-configure}:32141: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me-configure}:32128: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me-configure}:32143: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:32130: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32253,11 +32240,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:32256: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:32243: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32260 "configure"
+#line 32247 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32274,21 +32261,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32277: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32264: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32280: \$? = $ac_status" >&5
+  echo "$as_me:32267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32286: \$? = $ac_status" >&5
+  echo "$as_me:32273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:32291: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:32278: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32306,7 +32293,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:32309: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:32296: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32314,7 +32301,7 @@ echo "${as_me-configure}:32309: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32317 "configure"
+#line 32304 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32331,21 +32318,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32337: \$? = $ac_status" >&5
+  echo "$as_me:32324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32343: \$? = $ac_status" >&5
+  echo "$as_me:32330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:32348: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:32335: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -32448,13 +32435,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_bz2 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:32451: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:32438: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lbz2  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
             cat >conftest.$ac_ext <<_ACEOF
-#line 32457 "configure"
+#line 32444 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32471,21 +32458,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32477: \$? = $ac_status" >&5
+  echo "$as_me:32464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32483: \$? = $ac_status" >&5
+  echo "$as_me:32470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:32488: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:32475: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -32544,7 +32531,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32547 "configure"
+#line 32534 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32556,16 +32543,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32562: \$? = $ac_status" >&5
+  echo "$as_me:32549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32568: \$? = $ac_status" >&5
+  echo "$as_me:32555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32582,7 +32569,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32585: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:32572: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32616,7 +32603,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32619: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:32606: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32627,7 +32614,7 @@ fi
 	LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:32630: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:32617: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -32637,7 +32624,7 @@ EOF
 
 fi
 
-echo "$as_me:32640: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:32627: checking if you want to use zlib for decompression of some gzip files" >&5
 echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
 
 # Check whether --with-zlib or --without-zlib was given.
@@ -32647,7 +32634,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:32650: result: $use_zlib" >&5
+echo "$as_me:32637: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -32686,7 +32673,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32689 "configure"
+#line 32676 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32698,16 +32685,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32701: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32704: \$? = $ac_status" >&5
+  echo "$as_me:32691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32710: \$? = $ac_status" >&5
+  echo "$as_me:32697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32724,7 +32711,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32727: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:32714: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32765,7 +32752,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32768 "configure"
+#line 32755 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32777,16 +32764,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32767: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32783: \$? = $ac_status" >&5
+  echo "$as_me:32770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32789: \$? = $ac_status" >&5
+  echo "$as_me:32776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32803,7 +32790,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:32806: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:32793: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32819,7 +32806,7 @@ echo "${as_me-configure}:32806: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:32822: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:32809: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32844,7 +32831,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32847: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:32834: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32873,7 +32860,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:32876: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:32863: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32882,7 +32869,7 @@ echo "${as_me-configure}:32876: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:32885: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:32872: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32896,12 +32883,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:32899: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:32886: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32904 "configure"
+#line 32891 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -32917,16 +32904,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32923: \$? = $ac_status" >&5
+  echo "$as_me:32910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32929: \$? = $ac_status" >&5
+  echo "$as_me:32916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -32940,7 +32927,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32943 "configure"
+#line 32930 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -32956,16 +32943,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32959: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32962: \$? = $ac_status" >&5
+  echo "$as_me:32949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32968: \$? = $ac_status" >&5
+  echo "$as_me:32955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -32982,9 +32969,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me-configure}:32985: testing find linkage for z library ..." 1>&5
+echo "${as_me-configure}:32972: testing find linkage for z library ..." 1>&5
 
-echo "${as_me-configure}:32987: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:32974: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33097,11 +33084,11 @@ cf_search="$cf_search $cf_header_path_list"
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:33100: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:33087: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33104 "configure"
+#line 33091 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33117,21 +33104,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33123: \$? = $ac_status" >&5
+  echo "$as_me:33110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33129: \$? = $ac_status" >&5
+  echo "$as_me:33116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:33134: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:33121: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33149,7 +33136,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:33152: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:33139: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33157,7 +33144,7 @@ echo "${as_me-configure}:33152: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33160 "configure"
+#line 33147 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33173,21 +33160,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33179: \$? = $ac_status" >&5
+  echo "$as_me:33166: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33185: \$? = $ac_status" >&5
+  echo "$as_me:33172: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:33190: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:33177: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -33290,13 +33277,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_z ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:33293: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:33280: testing ... testing $cf_cv_library_path_z ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lz  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
             cat >conftest.$ac_ext <<_ACEOF
-#line 33299 "configure"
+#line 33286 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33312,21 +33299,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33318: \$? = $ac_status" >&5
+  echo "$as_me:33305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33324: \$? = $ac_status" >&5
+  echo "$as_me:33311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:33329: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:33316: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -33385,7 +33372,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33388 "configure"
+#line 33375 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33397,16 +33384,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33403: \$? = $ac_status" >&5
+  echo "$as_me:33390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33409: \$? = $ac_status" >&5
+  echo "$as_me:33396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33423,7 +33410,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:33426: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:33413: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33457,7 +33444,7 @@ if test -n "$cf_cv_library_path_z" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:33460: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:33447: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33468,7 +33455,7 @@ fi
 	LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:33471: WARNING: Cannot find z library" >&5
+{ echo "$as_me:33458: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -33478,7 +33465,7 @@ EOF
 
 fi
 
-echo "$as_me:33481: checking if you want to exclude FINGER code" >&5
+echo "$as_me:33468: checking if you want to exclude FINGER code" >&5
 echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
 
 # Check whether --enable-finger or --disable-finger was given.
@@ -33495,13 +33482,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:33498: result: $use_finger" >&5
+echo "$as_me:33485: result: $use_finger" >&5
 echo "${ECHO_T}$use_finger" >&6
 test $use_finger != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FINGER 1
 EOF
 
-echo "$as_me:33504: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:33491: checking if you want to exclude GOPHER code" >&5
 echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
 
 # Check whether --enable-gopher or --disable-gopher was given.
@@ -33518,13 +33505,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:33521: result: $use_gopher" >&5
+echo "$as_me:33508: result: $use_gopher" >&5
 echo "${ECHO_T}$use_gopher" >&6
 test $use_gopher != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_GOPHER 1
 EOF
 
-echo "$as_me:33527: checking if you want to exclude NEWS code" >&5
+echo "$as_me:33514: checking if you want to exclude NEWS code" >&5
 echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
 
 # Check whether --enable-news or --disable-news was given.
@@ -33541,13 +33528,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:33544: result: $use_news" >&5
+echo "$as_me:33531: result: $use_news" >&5
 echo "${ECHO_T}$use_news" >&6
 test $use_news != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_NEWS 1
 EOF
 
-echo "$as_me:33550: checking if you want to exclude FTP code" >&5
+echo "$as_me:33537: checking if you want to exclude FTP code" >&5
 echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
 
 # Check whether --enable-ftp or --disable-ftp was given.
@@ -33564,7 +33551,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:33567: result: $use_ftp" >&5
+echo "$as_me:33554: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -33572,7 +33559,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:33575: checking if directory-editor code should be used" >&5
+echo "$as_me:33562: checking if directory-editor code should be used" >&5
 echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
 
 # Check whether --enable-dired or --disable-dired was given.
@@ -33589,7 +33576,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:33592: result: $use_dired" >&5
+echo "$as_me:33579: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -33598,7 +33585,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:33601: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:33588: checking if you wish to allow extracting from archives via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
@@ -33614,10 +33601,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:33617: result: $enableval" >&5
+	echo "$as_me:33604: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33620: checking if DirEd mode should override keys" >&5
+	echo "$as_me:33607: checking if DirEd mode should override keys" >&5
 echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
 
 # Check whether --enable-dired-override or --disable-dired-override was given.
@@ -33639,10 +33626,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:33642: result: $enableval" >&5
+	echo "$as_me:33629: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33645: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:33632: checking if you wish to allow permissions commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-permit or --disable-dired-permit was given.
@@ -33664,10 +33651,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:33667: result: $enableval" >&5
+	echo "$as_me:33654: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33670: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:33657: checking if you wish to allow executable-permission commands via DirEd" >&5
 echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
@@ -33683,10 +33670,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:33686: result: $enableval" >&5
+	echo "$as_me:33673: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33689: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:33676: checking if you wish to allow \"tar\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-tar or --disable-dired-tar was given.
@@ -33708,10 +33695,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:33711: result: $enableval" >&5
+	echo "$as_me:33698: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33714: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:33701: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
@@ -33733,10 +33720,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:33736: result: $enableval" >&5
+	echo "$as_me:33723: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33739: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:33726: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-zip or --disable-dired-zip was given.
@@ -33758,10 +33745,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:33761: result: $enableval" >&5
+	echo "$as_me:33748: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:33764: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:33751: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
 echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
 
 # Check whether --enable-dired-gzip or --disable-dired-gzip was given.
@@ -33783,11 +33770,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:33786: result: $enableval" >&5
+	echo "$as_me:33773: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:33790: checking if you want long-directory listings" >&5
+echo "$as_me:33777: checking if you want long-directory listings" >&5
 echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
 
 # Check whether --enable-long-list or --disable-long-list was given.
@@ -33809,10 +33796,10 @@ else
 EOF
 
 fi;
-echo "$as_me:33812: result: $enableval" >&5
+echo "$as_me:33799: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:33815: checking if parent-directory references are permitted" >&5
+echo "$as_me:33802: checking if parent-directory references are permitted" >&5
 echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
 
 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
@@ -33828,7 +33815,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:33831: result: $enableval" >&5
+echo "$as_me:33818: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -33836,7 +33823,7 @@ for ac_prog in $TELNET telnet
 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:33839: checking for $ac_word" >&5
+echo "$as_me:33826: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TELNET+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33853,7 +33840,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_TELNET="$ac_dir/$ac_word"
-   echo "$as_me:33856: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33843: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33864,10 +33851,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:33867: result: $TELNET" >&5
+  echo "$as_me:33854: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:33870: result: no" >&5
+  echo "$as_me:33857: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33926,7 +33913,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:33929: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:33916: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -33943,7 +33930,7 @@ for ac_prog in $TN3270 tn3270
 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:33946: checking for $ac_word" >&5
+echo "$as_me:33933: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TN3270+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33960,7 +33947,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_TN3270="$ac_dir/$ac_word"
-   echo "$as_me:33963: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33950: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33971,10 +33958,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:33974: result: $TN3270" >&5
+  echo "$as_me:33961: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:33977: result: no" >&5
+  echo "$as_me:33964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34033,7 +34020,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34036: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34023: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -34050,7 +34037,7 @@ for ac_prog in $RLOGIN rlogin
 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:34053: checking for $ac_word" >&5
+echo "$as_me:34040: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RLOGIN+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34067,7 +34054,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_RLOGIN="$ac_dir/$ac_word"
-   echo "$as_me:34070: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34057: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34078,10 +34065,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:34081: result: $RLOGIN" >&5
+  echo "$as_me:34068: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:34084: result: no" >&5
+  echo "$as_me:34071: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34140,7 +34127,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34143: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34130: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -34157,7 +34144,7 @@ for ac_prog in $MV mv
 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:34160: checking for $ac_word" >&5
+echo "$as_me:34147: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MV+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34174,7 +34161,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_MV="$ac_dir/$ac_word"
-   echo "$as_me:34177: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34164: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34185,10 +34172,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:34188: result: $MV" >&5
+  echo "$as_me:34175: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:34191: result: no" >&5
+  echo "$as_me:34178: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34247,7 +34234,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34250: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34237: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -34264,7 +34251,7 @@ for ac_prog in $GZIP gzip
 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:34267: checking for $ac_word" >&5
+echo "$as_me:34254: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34281,7 +34268,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_GZIP="$ac_dir/$ac_word"
-   echo "$as_me:34284: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34271: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34292,10 +34279,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:34295: result: $GZIP" >&5
+  echo "$as_me:34282: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:34298: result: no" >&5
+  echo "$as_me:34285: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34354,7 +34341,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34357: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34344: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -34371,7 +34358,7 @@ for ac_prog in $UNCOMPRESS gunzip
 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:34374: checking for $ac_word" >&5
+echo "$as_me:34361: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34388,7 +34375,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_UNCOMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:34391: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34378: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34399,10 +34386,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:34402: result: $UNCOMPRESS" >&5
+  echo "$as_me:34389: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:34405: result: no" >&5
+  echo "$as_me:34392: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34461,7 +34448,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34464: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34451: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -34478,7 +34465,7 @@ for ac_prog in $UNZIP unzip
 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:34481: checking for $ac_word" >&5
+echo "$as_me:34468: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UNZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34495,7 +34482,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_UNZIP="$ac_dir/$ac_word"
-   echo "$as_me:34498: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34485: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34506,10 +34493,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:34509: result: $UNZIP" >&5
+  echo "$as_me:34496: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:34512: result: no" >&5
+  echo "$as_me:34499: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34568,7 +34555,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34571: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34558: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -34585,7 +34572,7 @@ for ac_prog in $BZIP2 bzip2
 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:34588: checking for $ac_word" >&5
+echo "$as_me:34575: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BZIP2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34602,7 +34589,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_BZIP2="$ac_dir/$ac_word"
-   echo "$as_me:34605: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34592: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34613,10 +34600,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:34616: result: $BZIP2" >&5
+  echo "$as_me:34603: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:34619: result: no" >&5
+  echo "$as_me:34606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34675,7 +34662,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34678: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34665: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -34692,7 +34679,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
 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:34695: checking for $ac_word" >&5
+echo "$as_me:34682: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_TAR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34709,7 +34696,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_TAR="$ac_dir/$ac_word"
-   echo "$as_me:34712: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34699: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34720,10 +34707,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:34723: result: $TAR" >&5
+  echo "$as_me:34710: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:34726: result: no" >&5
+  echo "$as_me:34713: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34782,7 +34769,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34785: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34772: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -34839,7 +34826,7 @@ for ac_prog in $COMPRESS compress
 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:34842: checking for $ac_word" >&5
+echo "$as_me:34829: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_COMPRESS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34856,7 +34843,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_COMPRESS="$ac_dir/$ac_word"
-   echo "$as_me:34859: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34846: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34867,10 +34854,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:34870: result: $COMPRESS" >&5
+  echo "$as_me:34857: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:34873: result: no" >&5
+  echo "$as_me:34860: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34929,7 +34916,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:34932: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:34919: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -34946,7 +34933,7 @@ for ac_prog in $RM rm
 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:34949: checking for $ac_word" >&5
+echo "$as_me:34936: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_RM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34963,7 +34950,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_RM="$ac_dir/$ac_word"
-   echo "$as_me:34966: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34953: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34974,10 +34961,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:34977: result: $RM" >&5
+  echo "$as_me:34964: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:34980: result: no" >&5
+  echo "$as_me:34967: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35036,7 +35023,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35039: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:35026: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -35053,7 +35040,7 @@ for ac_prog in $UUDECODE uudecode
 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:35056: checking for $ac_word" >&5
+echo "$as_me:35043: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_UUDECODE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35070,7 +35057,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_UUDECODE="$ac_dir/$ac_word"
-   echo "$as_me:35073: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35060: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35081,10 +35068,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:35084: result: $UUDECODE" >&5
+  echo "$as_me:35071: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:35087: result: no" >&5
+  echo "$as_me:35074: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35143,7 +35130,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35146: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:35133: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -35160,7 +35147,7 @@ for ac_prog in $ZCAT zcat
 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:35163: checking for $ac_word" >&5
+echo "$as_me:35150: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZCAT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35177,7 +35164,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_ZCAT="$ac_dir/$ac_word"
-   echo "$as_me:35180: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35167: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35188,10 +35175,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:35191: result: $ZCAT" >&5
+  echo "$as_me:35178: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:35194: result: no" >&5
+  echo "$as_me:35181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35250,7 +35237,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35253: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:35240: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -35267,7 +35254,7 @@ for ac_prog in $ZIP zip
 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:35270: checking for $ac_word" >&5
+echo "$as_me:35257: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35284,7 +35271,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_ZIP="$ac_dir/$ac_word"
-   echo "$as_me:35287: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35274: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35295,10 +35282,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:35298: result: $ZIP" >&5
+  echo "$as_me:35285: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:35301: result: no" >&5
+  echo "$as_me:35288: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35357,7 +35344,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35360: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:35347: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -35384,7 +35371,7 @@ for ac_prog in $INSTALL install
 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:35387: checking for $ac_word" >&5
+echo "$as_me:35374: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_INSTALL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35401,7 +35388,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_INSTALL="$ac_dir/$ac_word"
-   echo "$as_me:35404: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35391: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35412,10 +35399,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:35415: result: $INSTALL" >&5
+  echo "$as_me:35402: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:35418: result: no" >&5
+  echo "$as_me:35405: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35474,7 +35461,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:35477: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:35464: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -35500,7 +35487,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:35503: checking for X" >&5
+	echo "$as_me:35490: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -35597,17 +35584,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 35600 "configure"
+#line 35587 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:35604: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:35591: \"$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:35610: \$? = $ac_status" >&5
+  echo "$as_me:35597: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -35640,7 +35627,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 35643 "configure"
+#line 35630 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -35652,16 +35639,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35655: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35658: \$? = $ac_status" >&5
+  echo "$as_me:35645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35661: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35664: \$? = $ac_status" >&5
+  echo "$as_me:35651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -35699,7 +35686,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:35702: result: $have_x" >&5
+  echo "$as_me:35689: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -35709,7 +35696,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:35712: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:35699: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -35733,11 +35720,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:35736: checking whether -R must be followed by a space" >&5
+      echo "$as_me:35723: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 35740 "configure"
+#line 35727 "configure"
 #include "confdefs.h"
 
 int
@@ -35749,16 +35736,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35755: \$? = $ac_status" >&5
+  echo "$as_me:35742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35761: \$? = $ac_status" >&5
+  echo "$as_me:35748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -35768,13 +35755,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:35771: result: no" >&5
+	echo "$as_me:35758: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 35777 "configure"
+#line 35764 "configure"
 #include "confdefs.h"
 
 int
@@ -35786,16 +35773,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35792: \$? = $ac_status" >&5
+  echo "$as_me:35779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35798: \$? = $ac_status" >&5
+  echo "$as_me:35785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -35805,11 +35792,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:35808: result: yes" >&5
+	  echo "$as_me:35795: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:35812: result: neither works" >&5
+	  echo "$as_me:35799: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -35829,7 +35816,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 35832 "configure"
+#line 35819 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35848,22 +35835,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35854: \$? = $ac_status" >&5
+  echo "$as_me:35841: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35844: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35860: \$? = $ac_status" >&5
+  echo "$as_me:35847: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:35866: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:35853: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35871,7 +35858,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 35874 "configure"
+#line 35861 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35890,16 +35877,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35896: \$? = $ac_status" >&5
+  echo "$as_me:35883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35902: \$? = $ac_status" >&5
+  echo "$as_me:35889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -35910,14 +35897,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35913: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:35900: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:35920: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:35907: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35925,7 +35912,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 35928 "configure"
+#line 35915 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35944,16 +35931,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35950: \$? = $ac_status" >&5
+  echo "$as_me:35937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35956: \$? = $ac_status" >&5
+  echo "$as_me:35943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -35964,7 +35951,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35967: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:35954: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -35983,13 +35970,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:35986: checking for gethostbyname" >&5
+    echo "$as_me:35973: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 35992 "configure"
+#line 35979 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -36020,16 +36007,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36026: \$? = $ac_status" >&5
+  echo "$as_me:36013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36032: \$? = $ac_status" >&5
+  echo "$as_me:36019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -36039,11 +36026,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36042: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:36029: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:36046: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:36033: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36051,7 +36038,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36054 "configure"
+#line 36041 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36070,16 +36057,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36076: \$? = $ac_status" >&5
+  echo "$as_me:36063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36082: \$? = $ac_status" >&5
+  echo "$as_me:36069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -36090,14 +36077,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36093: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:36080: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:36100: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:36087: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36105,7 +36092,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36108 "configure"
+#line 36095 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36124,16 +36111,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36130: \$? = $ac_status" >&5
+  echo "$as_me:36117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36136: \$? = $ac_status" >&5
+  echo "$as_me:36123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -36144,7 +36131,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36147: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:36134: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -36160,13 +36147,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:36163: checking for connect" >&5
+    echo "$as_me:36150: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 36169 "configure"
+#line 36156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -36197,16 +36184,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36203: \$? = $ac_status" >&5
+  echo "$as_me:36190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36209: \$? = $ac_status" >&5
+  echo "$as_me:36196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -36216,11 +36203,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36219: result: $ac_cv_func_connect" >&5
+echo "$as_me:36206: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:36223: checking for connect in -lsocket" >&5
+      echo "$as_me:36210: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36228,7 +36215,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36231 "configure"
+#line 36218 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36247,16 +36234,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36253: \$? = $ac_status" >&5
+  echo "$as_me:36240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36259: \$? = $ac_status" >&5
+  echo "$as_me:36246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -36267,7 +36254,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36270: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:36257: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -36276,13 +36263,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:36279: checking for remove" >&5
+    echo "$as_me:36266: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 36285 "configure"
+#line 36272 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -36313,16 +36300,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36303: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36319: \$? = $ac_status" >&5
+  echo "$as_me:36306: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36309: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36325: \$? = $ac_status" >&5
+  echo "$as_me:36312: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -36332,11 +36319,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36335: result: $ac_cv_func_remove" >&5
+echo "$as_me:36322: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:36339: checking for remove in -lposix" >&5
+      echo "$as_me:36326: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36344,7 +36331,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36347 "configure"
+#line 36334 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36363,16 +36350,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36369: \$? = $ac_status" >&5
+  echo "$as_me:36356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36375: \$? = $ac_status" >&5
+  echo "$as_me:36362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -36383,7 +36370,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36386: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:36373: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -36392,13 +36379,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:36395: checking for shmat" >&5
+    echo "$as_me:36382: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 36401 "configure"
+#line 36388 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -36429,16 +36416,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36435: \$? = $ac_status" >&5
+  echo "$as_me:36422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36441: \$? = $ac_status" >&5
+  echo "$as_me:36428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -36448,11 +36435,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36451: result: $ac_cv_func_shmat" >&5
+echo "$as_me:36438: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:36455: checking for shmat in -lipc" >&5
+      echo "$as_me:36442: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36460,7 +36447,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36463 "configure"
+#line 36450 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36479,16 +36466,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36485: \$? = $ac_status" >&5
+  echo "$as_me:36472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36491: \$? = $ac_status" >&5
+  echo "$as_me:36478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -36499,7 +36486,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36502: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:36489: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -36517,7 +36504,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:36520: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:36507: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36525,7 +36512,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36528 "configure"
+#line 36515 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36544,16 +36531,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36550: \$? = $ac_status" >&5
+  echo "$as_me:36537: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36556: \$? = $ac_status" >&5
+  echo "$as_me:36543: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -36564,7 +36551,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36567: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:36554: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -36576,7 +36563,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:36579: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:36566: checking if you want to link with Xaw 3d library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
 withval=
 
@@ -36587,14 +36574,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:36590: result: yes" >&5
+	echo "$as_me:36577: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:36593: result: no" >&5
+	echo "$as_me:36580: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:36597: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:36584: checking if you want to link with neXT Athena library" >&5
 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
 withval=
 
@@ -36605,14 +36592,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:36608: result: yes" >&5
+	echo "$as_me:36595: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:36611: result: no" >&5
+	echo "$as_me:36598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:36615: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:36602: checking if you want to link with Athena-Plus library" >&5
 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
 withval=
 
@@ -36623,10 +36610,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:36626: result: yes" >&5
+	echo "$as_me:36613: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:36629: result: no" >&5
+	echo "$as_me:36616: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36646,17 +36633,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me-configure}:36649: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me-configure}:36636: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:36655: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me-configure}:36642: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:36659: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me-configure}:36646: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -36759,17 +36746,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me-configure}:36762: testing found package Xext ..." 1>&5
+echo "${as_me-configure}:36749: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:36768: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me-configure}:36755: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:36772: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me-configure}:36759: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -36853,7 +36840,7 @@ fi
 	:
 else
 
-	echo "$as_me:36856: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:36843: checking for XextCreateExtension in -lXext" >&5
 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36861,7 +36848,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36864 "configure"
+#line 36851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36880,16 +36867,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36886: \$? = $ac_status" >&5
+  echo "$as_me:36873: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36892: \$? = $ac_status" >&5
+  echo "$as_me:36879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -36900,7 +36887,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36903: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:36890: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -36913,17 +36900,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me-configure}:36916: testing found package xt ..." 1>&5
+echo "${as_me-configure}:36903: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me-configure}:36922: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me-configure}:36909: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me-configure}:36926: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me-configure}:36913: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37014,16 +37001,16 @@ fi
 		*)
 			test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me-configure}:37017: testing work around broken package ..." 1>&5
+echo "${as_me-configure}:37004: testing work around broken package ..." 1>&5
 
 			test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me-configure}:37021: testing ...before $LIBS ..." 1>&5
+echo "${as_me-configure}:37008: testing ...before $LIBS ..." 1>&5
 
 			LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/  / /g'`
 			test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me-configure}:37026: testing ...after  $LIBS ..." 1>&5
+echo "${as_me-configure}:37013: testing ...after  $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -37038,7 +37025,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:37041: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:37028: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -37109,7 +37096,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:37112: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:37099: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -37117,7 +37104,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:37120: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:37107: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -37125,14 +37112,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:37128: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:37115: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 37135 "configure"
+#line 37122 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37144,16 +37131,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37150: \$? = $ac_status" >&5
+  echo "$as_me:37137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37156: \$? = $ac_status" >&5
+  echo "$as_me:37143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -37161,12 +37148,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:37164: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:37151: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:37169: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:37156: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -37174,13 +37161,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:37177: checking for XOpenDisplay" >&5
+	echo "$as_me:37164: checking for XOpenDisplay" >&5
 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 37183 "configure"
+#line 37170 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -37211,16 +37198,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37217: \$? = $ac_status" >&5
+  echo "$as_me:37204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37223: \$? = $ac_status" >&5
+  echo "$as_me:37210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -37230,13 +37217,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37233: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:37220: result: $ac_cv_func_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
 if test $ac_cv_func_XOpenDisplay = yes; then
   :
 else
 
-	echo "$as_me:37239: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:37226: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37244,7 +37231,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37247 "configure"
+#line 37234 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37263,16 +37250,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37269: \$? = $ac_status" >&5
+  echo "$as_me:37256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37275: \$? = $ac_status" >&5
+  echo "$as_me:37262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -37283,7 +37270,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37286: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:37273: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -37291,13 +37278,13 @@ fi
 
 fi
 
-	echo "$as_me:37294: checking for XtAppInitialize" >&5
+	echo "$as_me:37281: checking for XtAppInitialize" >&5
 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 37300 "configure"
+#line 37287 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -37328,16 +37315,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37334: \$? = $ac_status" >&5
+  echo "$as_me:37321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37340: \$? = $ac_status" >&5
+  echo "$as_me:37327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -37347,13 +37334,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37350: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:37337: result: $ac_cv_func_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
 if test $ac_cv_func_XtAppInitialize = yes; then
   :
 else
 
-	echo "$as_me:37356: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:37343: checking for XtAppInitialize in -lXt" >&5
 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37361,7 +37348,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37364 "configure"
+#line 37351 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37380,16 +37367,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37386: \$? = $ac_status" >&5
+  echo "$as_me:37373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37392: \$? = $ac_status" >&5
+  echo "$as_me:37379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -37400,7 +37387,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37403: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:37390: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -37416,7 +37403,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:37419: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:37406: WARNING: Unable to successfully link X Toolkit library (-lXt) with
 test program.  You will have to check and add the proper libraries by hand
 to makefile." >&5
 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -37438,14 +37425,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:37441: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:37428: checking for $cf_test in $cf_path" >&5
 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
 		else
-			echo "$as_me:37444: checking for $cf_test" >&5
+			echo "$as_me:37431: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 37448 "configure"
+#line 37435 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -37459,16 +37446,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:37462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37465: \$? = $ac_status" >&5
+  echo "$as_me:37452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:37468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37471: \$? = $ac_status" >&5
+  echo "$as_me:37458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -37477,7 +37464,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:37480: result: $cf_result" >&5
+		echo "$as_me:37467: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -37489,7 +37476,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:37492: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:37479: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -37514,15 +37501,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:37517: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:37504: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:37521: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:37508: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 37525 "configure"
+#line 37512 "configure"
 #include "confdefs.h"
 
 int
@@ -37534,16 +37521,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37540: \$? = $ac_status" >&5
+  echo "$as_me:37527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37546: \$? = $ac_status" >&5
+  echo "$as_me:37533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -37552,7 +37539,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:37555: result: $cf_result" >&5
+			echo "$as_me:37542: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -37564,7 +37551,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:37567: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:37554: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -37581,7 +37568,7 @@ for ac_prog in xcurses-config
 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:37584: checking for $ac_word" >&5
+echo "$as_me:37571: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37598,7 +37585,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_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:37601: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37588: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37609,10 +37596,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:37612: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:37599: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:37615: result: no" >&5
+  echo "$as_me:37602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37633,7 +37620,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:37636: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:37623: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -37704,7 +37691,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:37707: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:37694: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -37712,7 +37699,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:37715: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:37702: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -37720,14 +37707,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:37723: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:37710: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 37730 "configure"
+#line 37717 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37739,16 +37726,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37745: \$? = $ac_status" >&5
+  echo "$as_me:37732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37751: \$? = $ac_status" >&5
+  echo "$as_me:37738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -37756,12 +37743,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:37759: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:37746: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:37764: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:37751: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -37769,7 +37756,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:37772: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:37759: checking for XOpenDisplay in -lX11" >&5
 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37777,7 +37764,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37780 "configure"
+#line 37767 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37796,16 +37783,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37802: \$? = $ac_status" >&5
+  echo "$as_me:37789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37808: \$? = $ac_status" >&5
+  echo "$as_me:37795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -37816,13 +37803,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37819: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:37806: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:37825: checking for XCurses library" >&5
+echo "$as_me:37812: checking for XCurses library" >&5
 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
 if test "${cf_cv_lib_XCurses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37830,7 +37817,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37833 "configure"
+#line 37820 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -37845,16 +37832,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37851: \$? = $ac_status" >&5
+  echo "$as_me:37838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37857: \$? = $ac_status" >&5
+  echo "$as_me:37844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -37865,7 +37852,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:37868: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:37855: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -37884,14 +37871,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:37887: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:37874: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:37894: checking if we can include termio.h with curses" >&5
+echo "$as_me:37881: checking if we can include termio.h with curses" >&5
 echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
 if test "${cf_cv_termio_and_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37901,7 +37888,7 @@ else
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir-.} -I${srcdir-.}/src -I${srcdir-.}/WWW/Library/Implementation"
     touch lynx_cfg.h
     cat >conftest.$ac_ext <<_ACEOF
-#line 37904 "configure"
+#line 37891 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -37915,16 +37902,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:37918: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37921: \$? = $ac_status" >&5
+  echo "$as_me:37908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:37924: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37927: \$? = $ac_status" >&5
+  echo "$as_me:37914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -37937,7 +37924,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:37940: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:37927: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -37952,23 +37939,23 @@ if test $cf_cv_screen != slang ; then
 for ac_header in $cf_cv_screen/term.h term.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:37955: checking for $ac_header" >&5
+echo "$as_me:37942: 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 37961 "configure"
+#line 37948 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:37965: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:37952: \"$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:37971: \$? = $ac_status" >&5
+  echo "$as_me:37958: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -37987,7 +37974,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:37990: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:37977: 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
@@ -37997,7 +37984,7 @@ EOF
 fi
 done
 
-echo "$as_me:38000: checking if curses supports alternate-character set" >&5
+echo "$as_me:37987: checking if curses supports alternate-character set" >&5
 echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
 if test "${cf_cv_alt_char_set+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38006,7 +37993,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38009 "configure"
+#line 37996 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38020,16 +38007,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38026: \$? = $ac_status" >&5
+  echo "$as_me:38013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38032: \$? = $ac_status" >&5
+  echo "$as_me:38019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -38043,20 +38030,20 @@ done
 
 fi
 
-echo "$as_me:38046: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:38033: result: $cf_cv_alt_char_set" >&5
 echo "${ECHO_T}$cf_cv_alt_char_set" >&6
 test $cf_cv_alt_char_set != no && cat >>confdefs.h <<EOF
 #define ALT_CHAR_SET $cf_cv_alt_char_set
 EOF
 
-echo "$as_me:38052: checking if curses supports fancy attributes" >&5
+echo "$as_me:38039: checking if curses supports fancy attributes" >&5
 echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
 if test "${cf_cv_fancy_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38059 "configure"
+#line 38046 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38074,16 +38061,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38077: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38080: \$? = $ac_status" >&5
+  echo "$as_me:38067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38086: \$? = $ac_status" >&5
+  echo "$as_me:38073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -38095,13 +38082,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38098: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:38085: result: $cf_cv_fancy_curses" >&5
 echo "${ECHO_T}$cf_cv_fancy_curses" >&6
 test $cf_cv_fancy_curses = yes && cat >>confdefs.h <<\EOF
 #define FANCY_CURSES 1
 EOF
 
-echo "$as_me:38104: checking for function curses_version" >&5
+echo "$as_me:38091: checking for function curses_version" >&5
 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
 if test "${cf_cv_func_curses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38111,7 +38098,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38114 "configure"
+#line 38101 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38124,15 +38111,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:38127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38130: \$? = $ac_status" >&5
+  echo "$as_me:38117: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:38132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38119: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38135: \$? = $ac_status" >&5
+  echo "$as_me:38122: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -38147,21 +38134,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:38150: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:38137: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:38157: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:38144: checking for obsolete/broken version of ncurses" >&5
 echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
 if test "${cf_cv_ncurses_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 38164 "configure"
+#line 38151 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38180,16 +38167,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38170: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38186: \$? = $ac_status" >&5
+  echo "$as_me:38173: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38192: \$? = $ac_status" >&5
+  echo "$as_me:38179: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -38201,10 +38188,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38204: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:38191: result: $cf_cv_ncurses_broken" >&5
 echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
 if test "$cf_cv_ncurses_broken" = yes ; then
-	{ echo "$as_me:38207: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:38194: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -38213,14 +38200,14 @@ EOF
 fi
 fi
 
-echo "$as_me:38216: checking if curses supports color attributes" >&5
+echo "$as_me:38203: checking if curses supports color attributes" >&5
 echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
 if test "${cf_cv_color_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38223 "configure"
+#line 38210 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38240,16 +38227,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38246: \$? = $ac_status" >&5
+  echo "$as_me:38233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38252: \$? = $ac_status" >&5
+  echo "$as_me:38239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -38261,7 +38248,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38264: result: $cf_cv_color_curses" >&5
+echo "$as_me:38251: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -38281,23 +38268,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:38284: checking for $ac_header" >&5
+echo "$as_me:38271: 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 38290 "configure"
+#line 38277 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:38294: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38281: \"$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:38300: \$? = $ac_status" >&5
+  echo "$as_me:38287: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38316,7 +38303,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:38319: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:38306: 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
@@ -38331,23 +38318,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:38334: checking for $ac_header" >&5
+echo "$as_me:38321: 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 38340 "configure"
+#line 38327 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:38344: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38331: \"$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:38350: \$? = $ac_status" >&5
+  echo "$as_me:38337: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38366,7 +38353,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:38369: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:38356: 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
@@ -38384,10 +38371,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:38387: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:38374: checking whether termios.h needs _POSIX_SOURCE" >&5
 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38390 "configure"
+#line 38377 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -38399,16 +38386,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38405: \$? = $ac_status" >&5
+  echo "$as_me:38392: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38411: \$? = $ac_status" >&5
+  echo "$as_me:38398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -38416,7 +38403,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 38419 "configure"
+#line 38406 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -38430,16 +38417,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38436: \$? = $ac_status" >&5
+  echo "$as_me:38423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38442: \$? = $ac_status" >&5
+  echo "$as_me:38429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -38454,12 +38441,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:38457: result: $termios_bad" >&5
+	echo "$as_me:38444: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:38462: checking declaration of size-change" >&5
+echo "$as_me:38449: checking declaration of size-change" >&5
 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
 if test "${cf_cv_sizechange+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38474,7 +38461,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 38477 "configure"
+#line 38464 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -38518,16 +38505,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38524: \$? = $ac_status" >&5
+  echo "$as_me:38511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38530: \$? = $ac_status" >&5
+  echo "$as_me:38517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -38546,7 +38533,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:38549: result: $cf_cv_sizechange" >&5
+echo "$as_me:38536: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -38563,14 +38550,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:38566: checking if ttytype is declared in curses library" >&5
+echo "$as_me:38553: checking if ttytype is declared in curses library" >&5
 echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
 if test "${cf_cv_have_ttytype+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38573 "configure"
+#line 38560 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -38582,16 +38569,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38588: \$? = $ac_status" >&5
+  echo "$as_me:38575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38594: \$? = $ac_status" >&5
+  echo "$as_me:38581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -38603,7 +38590,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:38606: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:38593: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -38611,14 +38598,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:38614: checking if curses supports wide characters" >&5
+echo "$as_me:38601: checking if curses supports wide characters" >&5
 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
 if test "${cf_cv_widec_curses+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 38621 "configure"
+#line 38608 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38637,16 +38624,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38643: \$? = $ac_status" >&5
+  echo "$as_me:38630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38649: \$? = $ac_status" >&5
+  echo "$as_me:38636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -38657,7 +38644,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:38660: result: $cf_cv_widec_curses" >&5
+echo "$as_me:38647: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -38666,14 +38653,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:38669: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:38656: checking if we must include wchar.h to declare mbstate_t" >&5
 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
 if test "${cf_cv_widec_mbstate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38676 "configure"
+#line 38663 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38687,23 +38674,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38693: \$? = $ac_status" >&5
+  echo "$as_me:38680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38699: \$? = $ac_status" >&5
+  echo "$as_me:38686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 38706 "configure"
+#line 38693 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38718,16 +38705,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38721: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38724: \$? = $ac_status" >&5
+  echo "$as_me:38711: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38730: \$? = $ac_status" >&5
+  echo "$as_me:38717: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -38739,7 +38726,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:38742: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:38729: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -38760,14 +38747,14 @@ fi
 
 	fi
 
-echo "$as_me:38763: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:38750: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 38770 "configure"
+#line 38757 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38789,23 +38776,23 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38795: \$? = $ac_status" >&5
+  echo "$as_me:38782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38801: \$? = $ac_status" >&5
+  echo "$as_me:38788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 38808 "configure"
+#line 38795 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -38827,16 +38814,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38833: \$? = $ac_status" >&5
+  echo "$as_me:38820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38839: \$? = $ac_status" >&5
+  echo "$as_me:38826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -38848,11 +38835,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38851: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:38838: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:38855: checking for term.h" >&5
+echo "$as_me:38842: checking for term.h" >&5
 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38865,7 +38852,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 38868 "configure"
+#line 38855 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38879,16 +38866,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38885: \$? = $ac_status" >&5
+  echo "$as_me:38872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38891: \$? = $ac_status" >&5
+  echo "$as_me:38878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -38907,7 +38894,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 38910 "configure"
+#line 38897 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -38925,16 +38912,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38928: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38915: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38931: \$? = $ac_status" >&5
+  echo "$as_me:38918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38934: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38937: \$? = $ac_status" >&5
+  echo "$as_me:38924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -38949,7 +38936,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:38952: result: $cf_cv_term_header" >&5
+echo "$as_me:38939: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -39000,10 +38987,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:39003: checking for ${cf_func}" >&5
+	echo "$as_me:38990: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:39006: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:38993: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39012,7 +38999,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 39015 "configure"
+#line 39002 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -39043,16 +39030,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39033: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39049: \$? = $ac_status" >&5
+  echo "$as_me:39036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39055: \$? = $ac_status" >&5
+  echo "$as_me:39042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -39068,7 +39055,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:39071: result: $cf_result" >&5
+	echo "$as_me:39058: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -39084,13 +39071,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:39087: checking for $ac_func" >&5
+echo "$as_me:39074: 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 39093 "configure"
+#line 39080 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -39121,16 +39108,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39127: \$? = $ac_status" >&5
+  echo "$as_me:39114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39133: \$? = $ac_status" >&5
+  echo "$as_me:39120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -39140,7 +39127,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39143: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:39130: 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
@@ -39154,12 +39141,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:39157: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:39144: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 	if test $cf_cv_screen = slang ; then
-		{ { echo "$as_me:39162: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:39149: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -39167,7 +39154,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:39170: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:39157: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -39180,7 +39167,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:39183: checking for an rpath option" >&5
+echo "$as_me:39170: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -39211,17 +39198,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:39214: result: $LD_RPATH_OPT" >&5
+echo "$as_me:39201: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:39219: checking if we need a space after rpath option" >&5
+	echo "$as_me:39206: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39224 "configure"
+#line 39211 "configure"
 #include "confdefs.h"
 
 int
@@ -39233,16 +39220,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39239: \$? = $ac_status" >&5
+  echo "$as_me:39226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39245: \$? = $ac_status" >&5
+  echo "$as_me:39232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -39252,13 +39239,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:39255: result: $cf_rpath_space" >&5
+	echo "$as_me:39242: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:39261: checking if rpath should be not be set" >&5
+echo "$as_me:39248: checking if rpath should be not be set" >&5
 echo $ECHO_N "checking if rpath should be not be set... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -39275,21 +39262,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:39278: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:39265: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:39282: checking for updated LDFLAGS" >&5
+echo "$as_me:39269: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:39285: result: maybe" >&5
+	echo "$as_me:39272: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 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:39292: checking for $ac_word" >&5
+echo "$as_me:39279: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39304,7 +39291,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:39307: found $ac_dir/$ac_word" >&5
+echo "$as_me:39294: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -39312,10 +39299,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:39315: result: $cf_ldd_prog" >&5
+  echo "$as_me:39302: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:39318: result: no" >&5
+  echo "$as_me:39305: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39327,7 +39314,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 	if test "$cf_ldd_prog" != no
 	then
 cat >conftest.$ac_ext <<_ACEOF
-#line 39330 "configure"
+#line 39317 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39339,16 +39326,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39345: \$? = $ac_status" >&5
+  echo "$as_me:39332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39351: \$? = $ac_status" >&5
+  echo "$as_me:39338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
 else
@@ -39360,11 +39347,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39363: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:39350: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39367: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:39354: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -39401,7 +39388,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me-configure}:39404: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me-configure}:39391: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -39414,11 +39401,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39417: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:39404: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me-configure}:39421: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me-configure}:39408: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -39455,7 +39442,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me-configure}:39458: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me-configure}:39445: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -39468,11 +39455,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me-configure}:39471: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me-configure}:39458: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me-configure}:39475: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:39462: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -39486,9 +39473,9 @@ srcdir="$srcdir"
 SRCDIR_CLEAN="#"
 if test -n "$srcdir" ; then
 	echo srcdir is $srcdir
-	$CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation
-	$CONFIG_SHELL $MKINSTALLDIRS src/chrtrans
-	test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl
+	mkdir -p WWW/Library/Implementation
+	mkdir -p src/chrtrans
+	test "$USE_INCLUDED_LIBINTL" = yes && mkdir -p intl
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
@@ -39573,7 +39560,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:39576: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:39563: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -39749,7 +39736,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:39752: error: ambiguous option: $1
+    { { echo "$as_me:39739: 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;}
@@ -39768,7 +39755,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:39771: error: unrecognized option: $1
+  -*) { { echo "$as_me:39758: 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;}
@@ -39821,7 +39808,7 @@ do
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
-  *) { { echo "$as_me:39824: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:39811: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -39977,7 +39964,6 @@ s,@POSUB@,$POSUB,;t t
 s,@DATADIRNAME@,$DATADIRNAME,;t t
 s,@INSTOBJEXT@,$INSTOBJEXT,;t t
 s,@GENCAT@,$GENCAT,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
 s,@MSG_DIR_MAKE@,$MSG_DIR_MAKE,;t t
 s,@SUB_MAKEFILE@,$SUB_MAKEFILE,;t t
@@ -40142,7 +40128,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:40145: creating $ac_file" >&5
+    { echo "$as_me:40131: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -40160,7 +40146,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:40163: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:40149: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -40173,7 +40159,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:40176: error: cannot find input file: $f" >&5
+           { { echo "$as_me:40162: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -40239,7 +40225,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:40242: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:40228: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -40250,7 +40236,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:40253: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:40239: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -40263,7 +40249,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:40266: error: cannot find input file: $f" >&5
+           { { echo "$as_me:40252: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -40381,7 +40367,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:40384: $ac_file is unchanged" >&5
+      { echo "$as_me:40370: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index d39cd3f6..9977b70a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.212 2010/04/25 23:44:30 tom Exp $
+dnl $LynxId: configure.in,v 1.213 2010/06/19 10:56:00 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -1495,9 +1495,9 @@ srcdir="$srcdir"
 SRCDIR_CLEAN="#"
 if test -n "$srcdir" ; then
 	echo srcdir is $srcdir
-	$CONFIG_SHELL $MKINSTALLDIRS WWW/Library/Implementation
-	$CONFIG_SHELL $MKINSTALLDIRS src/chrtrans
-	test "$USE_INCLUDED_LIBINTL" = yes && $CONFIG_SHELL $MKINSTALLDIRS intl
+	mkdir -p WWW/Library/Implementation
+	mkdir -p src/chrtrans
+	test "$USE_INCLUDED_LIBINTL" = yes && mkdir -p intl
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 2e4136ee..f77d28b4 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<!-- $LynxId: Lynx_users_guide.html,v 1.109 2009/11/18 09:30:13 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.110 2010/06/19 11:09:56 Paul.B.Mahol Exp $ -->
 <html>
 <head>
 <title>Lynx Users Guide v2.8.7</title>
@@ -3056,7 +3056,7 @@ where
                     to that file on exit.
              <dt><code>-sessionin=FILENAME</code>
                 <dd>resumes session from specified file.
-             <dt><code>-sessionout=FILENAME=</code>
+             <dt><code>-sessionout=FILENAME</code>
                 <dd>saves session to specified file.
              <dt><code>-short_url</code>
                 <dd>show very long URLs in the status line with "..." to
diff --git a/makefile.in b/makefile.in
index 55f44984..933604c6 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.108 2010/05/02 21:12:41 tom Exp $
+# $LynxId: makefile.in,v 1.109 2010/06/19 10:56:15 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -30,8 +30,6 @@ INSTALL_DATA	= @INSTALL_DATA@
 
 LN_S		= @LN_S@
 
-MKINSTALLDIRS	= @MKINSTALLDIRS@
-
 TAR		= @TAR@
 TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
@@ -454,6 +452,6 @@ $(MANDIR) \
 $(SYSCONFDIR) \
 $(HELPDIR) \
 $(DOCDIR) :
-	$(SHELL) $(MKINSTALLDIRS) $@
+	mkdir -p $@
 etags:
 	etags -r "/\(PRIVATE\|PUBLIC\)[ \t]+\([a-zA-Z_][a-zA-Z_0-1]*[ \t*]+\)*\([a-zA-Z_][a-zA-Z_0-1]*\)[ \t]+\(ARGS[0-9]\|NOARGS\)/\3/" *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch]
diff --git a/mkdirs.sh b/mkdirs.sh
deleted file mode 100755
index cd10280f..00000000
--- a/mkdirs.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-# $Id: mkdirs.sh,v 1.6 2007/03/25 22:29:46 tom Exp $
-# -----------------------------------------------------------------------------
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-# -----------------------------------------------------------------------------
-
-errstatus=0
-umask 022
-
-for file in ${1+"$@"} ; do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        case "$pathcomp" in
-          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
-            ;;               # DOSISH systems
-          * )
-            mkdir "$pathcomp"
-            errstatus=$?
-            if test $errstatus != 0
-            then
-               # may have failed if invoked in a parallel "make -j# install"
-               if test -d "$pathcomp"
-               then
-                  errstatus=0
-               fi
-            fi
-            ;;
-        esac
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/po/makefile.inn b/po/makefile.inn
index 328b24c1..07c832d4 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -1,4 +1,4 @@
-# $LynxId: makefile.inn,v 1.16 2008/07/19 11:07:29 tom Exp $
+# $LynxId: makefile.inn,v 1.17 2010/06/19 10:57:02 tom Exp $
 #
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@@ -37,7 +37,6 @@ GETTEXTSRCDIR	= $(DESTDIR)$(gettextsrcdir)
 
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-MKINSTALLDIRS	= @MKINSTALLDIRS@
 
 CC		= @CC@
 GENCAT		= @GENCAT@
@@ -124,11 +123,7 @@ install-exec:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DATADIR); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkdirs.sh $(DATADIR); \
-	fi
+	mkdir -p $(DATADIR); \
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -138,11 +133,7 @@ install-data-yes: all
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkdirs.sh $$dir; \
-	  fi; \
+	  mkdir -p $$dir; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
 	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
@@ -166,11 +157,7 @@ install-data-yes: all
 	  fi; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(GETTEXTSRCDIR); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkdirs.sh $(GETTEXTSRCDIR); \
-	  fi; \
+	  mkdir -p $(GETTEXTSRCDIR); \
 	  $(INSTALL_DATA) $(srcdir)/makefile.inn \
 			  $(GETTEXTSRCDIR)/makefile.inn; \
 	else \