snapshot of project "lynx", label v2-9-0dev_10n

5 files changed, 3935 insertions, 3923 deletions

diff --git a/CHANGES b/CHANGES
index e384770c..0ec3a3a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.1121 2022/10/26 22:10:34 tom Exp $
+-- $LynxId: CHANGES,v 1.1122 2022/12/04 21:25:47 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2022-10-26 (2.9.0dev.11)
+2022-12-04 (2.9.0dev.11)
+* modify configure script to reduce implicit-function warnings (report by
+  Florian Weimer) -TD
 * update configure script to work around regression in grep 3.8 -TD
 * add some consistency-checks to dtd_util to make it easier to use -TD
 * improve formatting of bookmark file, e.g., to fix warnings by tidy -TD
diff --git a/aclocal.m4 b/aclocal.m4
index b0ff8220..8efde6cf 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.310 2022/10/02 23:55:56 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.314 2022/12/04 21:39:19 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -1207,7 +1207,7 @@ if test "$cf_cv_bool_defs" = no ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 10 updated: 2022/09/24 16:36:41
+dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -1278,7 +1278,9 @@ if test "$cross_compiling" = yes ; then
 	cf_save_crossed=$cross_compiling
 	cf_save_ac_link=$ac_link
 	cross_compiling=no
-	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&AS_MESSAGE_LOG_FD'
+	cf_build_cppflags=$BUILD_CPPFLAGS
+	test "$cf_build_cppflags" = "#" && cf_build_cppflags=
+	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $cf_build_cppflags $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&AS_MESSAGE_LOG_FD'
 
 	AC_TRY_RUN([#include <stdio.h>
 		int main(int argc, char *argv[])
@@ -2097,7 +2099,7 @@ if (foo + 1234L > 5678L)
 done
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30
+dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52
 dnl ----------------
 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
 dnl variations of ncurses' installs.
@@ -2111,7 +2113,7 @@ for cf_header in \
 	curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h])
 do
 AC_TRY_COMPILE([#include <${cf_header}>],
-	[initscr(); tgoto("?", 0,0)],
+	[initscr(); endwin()],
 	[cf_cv_ncurses_header=$cf_header; break],[])
 done
 ])
@@ -2124,7 +2126,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 44 updated: 2021/01/02 09:31:20
+dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -2133,7 +2135,7 @@ AC_DEFUN([CF_CURSES_LIBS],[
 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
 AC_MSG_CHECKING(if we have identified curses libraries)
 AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-	[initscr(); tgoto("?", 0,0)],
+	[initscr(); endwin()],
 	cf_result=yes,
 	cf_result=no)
 AC_MSG_RESULT($cf_result)
@@ -2234,7 +2236,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 			elif test "$cf_term_lib" != predefined ; then
 				AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
 				AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-					[initscr(); tgoto((char *)0, 0, 0);],
+					[initscr(); endwin();],
 					[cf_result=no],
 					[
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
@@ -3129,7 +3131,7 @@ if test "$ac_cv_func_lstat" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_SIGACTION version: 3 updated: 2012/11/08 20:57:52
+dnl CF_FUNC_SIGACTION version: 4 updated: 2022/12/02 19:55:38
 dnl -----------------
 dnl Check if we have the sigaction function and related structures.
 AC_DEFUN([CF_FUNC_SIGACTION],[
@@ -3140,7 +3142,7 @@ AC_TRY_LINK([
 	[struct sigaction act;
 	act.sa_handler = SIG_DFL;
 #ifdef SA_RESTART
-	act.sa_flags |= SA_RESTART;
+	act.sa_flags = SA_RESTART;
 #endif /* SA_RESTART */
 	sigaction(1, &act, 0);
 	],
@@ -6050,7 +6052,7 @@ AC_MSG_RESULT($cf_use_socks5p_h)
 test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES,1,[Define to 1 if needed to declare prototypes in socks headers])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRAND version: 16 updated: 2021/06/08 18:08:14
+dnl CF_SRAND version: 17 updated: 2022/12/02 19:55:38
 dnl --------
 dnl Check for functions similar to srand() and rand().  lrand48() and random()
 dnl return a 31-bit value, while rand() returns a value less than RAND_MAX
@@ -6070,9 +6072,7 @@ do
 	CF_SRAND_PARSE($cf_func,cf_srand_func,cf_rand_func)
 
 AC_TRY_LINK([
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+$ac_includes_default
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -6464,7 +6464,7 @@ AC_SUBST(TAR_FILE_OPTIONS)
 AC_SUBST(TAR_PIPE_OPTIONS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMCAP_LIBS version: 15 updated: 2015/04/15 19:08:48
+dnl CF_TERMCAP_LIBS version: 16 updated: 2022/12/02 20:06:52
 dnl ---------------
 dnl Look for termcap libraries, or the equivalent in terminfo.
 dnl
@@ -6473,8 +6473,8 @@ AC_DEFUN([CF_TERMCAP_LIBS],
 [
 AC_CACHE_VAL(cf_cv_termlib,[
 cf_cv_termlib=none
-AC_TRY_LINK([],[char *x=(char*)tgoto("",0,0)],
-[AC_TRY_LINK([],[int x=tigetstr("")],
+AC_TRY_LINK([extern char *tgoto(const char*,int,int);],[char *x=tgoto("",0,0)],
+[AC_TRY_LINK([extern char *tigetstr(const char *)],[char *x=tigetstr("")],
 	[cf_cv_termlib=terminfo],
 	[cf_cv_termlib=termcap])
 	CF_VERBOSE(using functions in predefined $cf_cv_termlib LIBS)
@@ -6523,16 +6523,20 @@ if test "$cf_cv_termlib" = none; then
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMIO_AND_CURSES version: 6 updated: 2021/01/02 09:31:20
+dnl CF_TERMIO_AND_CURSES version: 7 updated: 2022/12/02 19:55:38
 dnl --------------------
 dnl Check if including termio.h with <curses.h> dies like on sysv68
-dnl FIXME: this is too Lynx-specific
+dnl
+dnl $1 = application header which must include <stdio.h>
+dnl $2 = optional, defaulting to config.h
+dnl
+dnl FIXME: CPPFLAGS is Lynx-specific.
 AC_DEFUN([CF_TERMIO_AND_CURSES],
 [
 AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
     cf_save_CFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
-    touch lynx_cfg.h
+    touch ifelse([$2],,config.h,[$2])
     AC_TRY_COMPILE([
 #include <$1>
 #include <termio.h>],
@@ -6540,13 +6544,13 @@ AC_CACHE_CHECK(if we can include termio.h with curses,cf_cv_termio_and_curses,[
     [cf_cv_termio_and_curses=yes],
     [cf_cv_termio_and_curses=no])
     CPPFLAGS="$cf_save_CFLAGS"
-    rm -f lynx_cfg.h
+    rm -f ifelse([$2],,config.h,[$2])
 ])
 
 test "$cf_cv_termio_and_curses" = yes && AC_DEFINE(TERMIO_AND_CURSES,1,[Define to 1 if we can include termio.h with curses.h])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_TERMIO_AND_TERMIOS version: 4 updated: 2021/01/02 09:31:20
+dnl CF_TERMIO_AND_TERMIOS version: 5 updated: 2022/12/02 19:55:38
 dnl ---------------------
 dnl Check if including both termio.h and termios.h die like on DG.UX
 AC_DEFUN([CF_TERMIO_AND_TERMIOS],
@@ -6554,6 +6558,7 @@ AC_DEFUN([CF_TERMIO_AND_TERMIOS],
 AC_MSG_CHECKING([termio.h and termios.h])
 AC_CACHE_VAL(cf_cv_termio_and_termios,[
     AC_TRY_COMPILE([
+#include <stdio.h>
 #if HAVE_TERMIO_H
 #include <termio.h>
 #endif
@@ -8019,10 +8024,11 @@ define([CF__ICONV_HEAD],[
 #include <iconv.h>]
 )dnl
 dnl ---------------------------------------------------------------------------
-dnl CF__INET_HEAD version: 1 updated: 2013/10/08 17:47:05
+dnl CF__INET_HEAD version: 2 updated: 2022/12/04 16:36:15
 dnl -------------
 dnl Header-files needed for inet.h compile-checks
 define([CF__INET_HEAD],[
+$ac_includes_default
 #if defined(__MINGW32__)
 
 #undef WIN32_LEAN_AND_MEAN
diff --git a/configure b/configure
index 26f95df9..a82b670f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in 2.9.0dev.11.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20221009.
+# Generated by Autoconf 2.52.20221202.
 #
 # Copyright 2003-2021,2022	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -898,7 +898,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20221009.  Invocation command line was
+generated by GNU Autoconf 2.52.20221202.  Invocation command line was
 
   $ $0 $@
 
@@ -3755,13 +3755,15 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 	cf_save_crossed=$cross_compiling
 	cf_save_ac_link=$ac_link
 	cross_compiling=no
-	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&5'
+	cf_build_cppflags=$BUILD_CPPFLAGS
+	test "$cf_build_cppflags" = "#" && cf_build_cppflags=
+	ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $cf_build_cppflags $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&5'
 
 	if test "$cross_compiling" = yes; then
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3764 "configure"
+#line 3766 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -3771,15 +3773,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:3774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3779: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3782: \$? = $ac_status" >&5
+  echo "$as_me:3784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -3794,12 +3796,12 @@ fi
 	cross_compiling=$cf_save_crossed
 	ac_link=$cf_save_ac_link
 
-	echo "$as_me:3797: result: $cf_ok_build_cc" >&5
+	echo "$as_me:3799: result: $cf_ok_build_cc" >&5
 echo "${ECHO_T}$cf_ok_build_cc" >&6
 
 	if test "$cf_ok_build_cc" != yes
 	then
-		{ { echo "$as_me:3802: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3804: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -3820,7 +3822,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3823: checking for $ac_word" >&5
+echo "$as_me:3825: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3835,7 +3837,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_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3838: found $ac_dir/$ac_word" >&5
+echo "$as_me:3840: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3843,10 +3845,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3846: result: $RANLIB" >&5
+  echo "$as_me:3848: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3849: result: no" >&5
+  echo "$as_me:3851: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3855,7 +3857,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3858: checking for $ac_word" >&5
+echo "$as_me:3860: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3870,7 +3872,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_ac_ct_RANLIB="ranlib"
-echo "$as_me:3873: found $ac_dir/$ac_word" >&5
+echo "$as_me:3875: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3879,10 +3881,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3882: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3884: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3885: result: no" >&5
+  echo "$as_me:3887: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3894,7 +3896,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3897: checking for $ac_word" >&5
+echo "$as_me:3899: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3909,7 +3911,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_AR="${ac_tool_prefix}ar"
-echo "$as_me:3912: found $ac_dir/$ac_word" >&5
+echo "$as_me:3914: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3917,10 +3919,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3920: result: $AR" >&5
+  echo "$as_me:3922: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3923: result: no" >&5
+  echo "$as_me:3925: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3929,7 +3931,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3932: checking for $ac_word" >&5
+echo "$as_me:3934: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3944,7 +3946,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_ac_ct_AR="ar"
-echo "$as_me:3947: found $ac_dir/$ac_word" >&5
+echo "$as_me:3949: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3953,10 +3955,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3956: result: $ac_ct_AR" >&5
+  echo "$as_me:3958: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3959: result: no" >&5
+  echo "$as_me:3961: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3965,7 +3967,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3968: checking for options to update archives" >&5
+echo "$as_me:3970: checking for options to update archives" >&5
 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
 if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4002,13 +4004,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4005 "configure"
+#line 4007 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4011: \$? = $ac_status" >&5
+  echo "$as_me:4013: \$? = $ac_status" >&5
   (exit "$ac_status"); } ; then
 				echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
 				$AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null
@@ -4019,7 +4021,7 @@ EOF
 			else
 				test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:4022: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:4024: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4029,7 +4031,7 @@ echo "${as_me:-configure}:4022: testing cannot compile test-program ..." 1>&5
 	esac
 
 fi
-echo "$as_me:4032: result: $cf_cv_ar_flags" >&5
+echo "$as_me:4034: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4040,7 +4042,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:4043: checking if you want to see long compiling messages" >&5
+echo "$as_me:4045: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -4074,7 +4076,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:4077: result: $enableval" >&5
+echo "$as_me:4079: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -4084,7 +4086,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:4087: checking if you want to check memory-leaks" >&5
+echo "$as_me:4089: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -4101,7 +4103,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:4104: result: $with_leak_checks" >&5
+echo "$as_me:4106: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -4111,7 +4113,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:4114: checking if you want to enable debug-code" >&5
+echo "$as_me:4116: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -4128,7 +4130,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:4131: result: $with_debug" >&5
+echo "$as_me:4133: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case "$host_os" in
@@ -4153,7 +4155,7 @@ else
 	esac
 fi
 
-echo "$as_me:4156: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:4158: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -4170,14 +4172,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:4173: result: $with_trace" >&5
+echo "$as_me:4175: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test "$with_trace" = no &&
 cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:4180: checking if you want verbose trace code" >&5
+echo "$as_me:4182: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -4194,7 +4196,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:4197: result: $with_vertrace" >&5
+echo "$as_me:4199: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test "$with_vertrace" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4203,7 +4205,7 @@ EOF
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:4206: checking for X" >&5
+	echo "$as_me:4208: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -4307,17 +4309,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 4310 "configure"
+#line 4312 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:4314: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:4316: \"$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:4320: \$? = $ac_status" >&5
+  echo "$as_me:4322: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4350,7 +4352,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4353 "configure"
+#line 4355 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -4362,16 +4364,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4368: \$? = $ac_status" >&5
+  echo "$as_me:4370: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4374: \$? = $ac_status" >&5
+  echo "$as_me:4376: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -4409,7 +4411,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:4412: result: $have_x" >&5
+  echo "$as_me:4414: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -4419,7 +4421,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:4422: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:4424: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -4446,11 +4448,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:4449: checking whether -R must be followed by a space" >&5
+      echo "$as_me:4451: 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 4453 "configure"
+#line 4455 "configure"
 #include "confdefs.h"
 
 int
@@ -4462,16 +4464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4468: \$? = $ac_status" >&5
+  echo "$as_me:4470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4474: \$? = $ac_status" >&5
+  echo "$as_me:4476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -4481,13 +4483,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:4484: result: no" >&5
+	echo "$as_me:4486: 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 4490 "configure"
+#line 4492 "configure"
 #include "confdefs.h"
 
 int
@@ -4499,16 +4501,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4505: \$? = $ac_status" >&5
+  echo "$as_me:4507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4511: \$? = $ac_status" >&5
+  echo "$as_me:4513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -4518,11 +4520,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:4521: result: yes" >&5
+	  echo "$as_me:4523: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:4525: result: neither works" >&5
+	  echo "$as_me:4527: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -4542,7 +4544,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 4545 "configure"
+#line 4547 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4561,22 +4563,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4567: \$? = $ac_status" >&5
+  echo "$as_me:4569: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4573: \$? = $ac_status" >&5
+  echo "$as_me:4575: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:4579: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:4581: 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
@@ -4584,7 +4586,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4587 "configure"
+#line 4589 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4603,16 +4605,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4609: \$? = $ac_status" >&5
+  echo "$as_me:4611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4615: \$? = $ac_status" >&5
+  echo "$as_me:4617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -4623,14 +4625,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4626: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:4628: 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:4633: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:4635: 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
@@ -4638,7 +4640,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4641 "configure"
+#line 4643 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4657,16 +4659,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4662: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4663: \$? = $ac_status" >&5
+  echo "$as_me:4665: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4669: \$? = $ac_status" >&5
+  echo "$as_me:4671: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -4677,7 +4679,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4680: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:4682: 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"
@@ -4696,13 +4698,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:4699: checking for gethostbyname" >&5
+    echo "$as_me:4701: 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 4705 "configure"
+#line 4707 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4733,16 +4735,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4739: \$? = $ac_status" >&5
+  echo "$as_me:4741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4745: \$? = $ac_status" >&5
+  echo "$as_me:4747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -4752,11 +4754,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4755: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:4757: 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:4759: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:4761: 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
@@ -4764,7 +4766,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4767 "configure"
+#line 4769 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4783,16 +4785,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4786: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4789: \$? = $ac_status" >&5
+  echo "$as_me:4791: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4795: \$? = $ac_status" >&5
+  echo "$as_me:4797: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -4803,14 +4805,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4806: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:4808: 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:4813: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:4815: 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
@@ -4818,7 +4820,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4821 "configure"
+#line 4823 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4837,16 +4839,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4843: \$? = $ac_status" >&5
+  echo "$as_me:4845: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4849: \$? = $ac_status" >&5
+  echo "$as_me:4851: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -4857,7 +4859,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4860: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:4862: 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"
@@ -4873,13 +4875,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:4876: checking for connect" >&5
+    echo "$as_me:4878: 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 4882 "configure"
+#line 4884 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4910,16 +4912,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4916: \$? = $ac_status" >&5
+  echo "$as_me:4918: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4922: \$? = $ac_status" >&5
+  echo "$as_me:4924: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -4929,11 +4931,11 @@ ac_cv_func_connect=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:4932: result: $ac_cv_func_connect" >&5
+echo "$as_me:4934: 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:4936: checking for connect in -lsocket" >&5
+      echo "$as_me:4938: 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
@@ -4941,7 +4943,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4944 "configure"
+#line 4946 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4960,16 +4962,16 @@ connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4966: \$? = $ac_status" >&5
+  echo "$as_me:4968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4972: \$? = $ac_status" >&5
+  echo "$as_me:4974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -4980,7 +4982,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4983: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:4985: 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"
@@ -4989,13 +4991,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:4992: checking for remove" >&5
+    echo "$as_me:4994: 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 4998 "configure"
+#line 5000 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5026,16 +5028,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5031: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5032: \$? = $ac_status" >&5
+  echo "$as_me:5034: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5037: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:5040: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -5045,11 +5047,11 @@ ac_cv_func_remove=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5048: result: $ac_cv_func_remove" >&5
+echo "$as_me:5050: 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:5052: checking for remove in -lposix" >&5
+      echo "$as_me:5054: 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
@@ -5057,7 +5059,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5060 "configure"
+#line 5062 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5076,16 +5078,16 @@ remove ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5082: \$? = $ac_status" >&5
+  echo "$as_me:5084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5088: \$? = $ac_status" >&5
+  echo "$as_me:5090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -5096,7 +5098,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5099: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:5101: 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"
@@ -5105,13 +5107,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:5108: checking for shmat" >&5
+    echo "$as_me:5110: 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 5114 "configure"
+#line 5116 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5142,16 +5144,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5145: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5148: \$? = $ac_status" >&5
+  echo "$as_me:5150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5154: \$? = $ac_status" >&5
+  echo "$as_me:5156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -5161,11 +5163,11 @@ ac_cv_func_shmat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:5164: result: $ac_cv_func_shmat" >&5
+echo "$as_me:5166: 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:5168: checking for shmat in -lipc" >&5
+      echo "$as_me:5170: 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
@@ -5173,7 +5175,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5176 "configure"
+#line 5178 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5192,16 +5194,16 @@ shmat ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5198: \$? = $ac_status" >&5
+  echo "$as_me:5200: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5204: \$? = $ac_status" >&5
+  echo "$as_me:5206: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -5212,7 +5214,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5215: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:5217: 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"
@@ -5230,7 +5232,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:5233: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:5235: 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
@@ -5238,7 +5240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5241 "configure"
+#line 5243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5257,16 +5259,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:5260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5263: \$? = $ac_status" >&5
+  echo "$as_me:5265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:5266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5269: \$? = $ac_status" >&5
+  echo "$as_me:5271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -5277,7 +5279,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:5280: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:5282: 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"
@@ -5289,7 +5291,7 @@ fi
 
 fi
 
-echo "$as_me:5292: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5294: checking if you want to use C11 _Noreturn feature" >&5
 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6
 
 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given.
@@ -5306,17 +5308,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5309: result: $enable_stdnoreturn" >&5
+echo "$as_me:5311: result: $enable_stdnoreturn" >&5
 echo "${ECHO_T}$enable_stdnoreturn" >&6
 
 if test $enable_stdnoreturn = yes; then
-echo "$as_me:5313: checking for C11 _Noreturn feature" >&5
+echo "$as_me:5315: checking for C11 _Noreturn feature" >&5
 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6
 if test "${cf_cv_c11_noreturn+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 5319 "configure"
+#line 5321 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5333,16 +5335,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5336: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5339: \$? = $ac_status" >&5
+  echo "$as_me:5341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5345: \$? = $ac_status" >&5
+  echo "$as_me:5347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5353,7 +5355,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5356: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5358: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5409,16 +5411,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5412: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5414: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5417: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5419: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5421: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5423: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5457,16 +5459,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5460: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5462: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5465: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5467: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5469: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5471: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5505,23 +5507,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5508: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5510: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5513: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5515: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5517: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5519: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:5524: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5526: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -5538,7 +5540,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:5541: result: $enable_warnings" >&5
+echo "$as_me:5543: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -5561,10 +5563,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:5564: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:5566: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 5567 "${as_me:-configure}"
+#line 5569 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -5613,12 +5615,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5618: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5619: \$? = $ac_status" >&5
+  echo "$as_me:5621: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5621: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:5623: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -5696,7 +5698,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5699 "configure"
+#line 5701 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5711,26 +5713,26 @@ String foo = malloc(1); free((void*)foo)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5717: \$? = $ac_status" >&5
+  echo "$as_me:5719: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5723: \$? = $ac_status" >&5
+  echo "$as_me:5725: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:5726: checking for X11/Xt const-feature" >&5
+echo "$as_me:5728: checking for X11/Xt const-feature" >&5
 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
 if test "${cf_cv_const_x_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 5733 "configure"
+#line 5735 "configure"
 #include "confdefs.h"
 
 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
@@ -5747,16 +5749,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5753: \$? = $ac_status" >&5
+  echo "$as_me:5755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5759: \$? = $ac_status" >&5
+  echo "$as_me:5761: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -5771,7 +5773,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5774: result: $cf_cv_const_x_string" >&5
+echo "$as_me:5776: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -5800,7 +5802,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 5803 "${as_me:-configure}"
+#line 5805 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -5816,7 +5818,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:5819: checking for $CC warning options..." >&5
+	{ echo "$as_me:5821: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -5832,12 +5834,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5835: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5838: \$? = $ac_status" >&5
+  echo "$as_me:5840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5840: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5842: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -5845,7 +5847,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:5848: checking for $CC warning options..." >&5
+	{ echo "$as_me:5850: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -5868,12 +5870,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:5871: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5874: \$? = $ac_status" >&5
+  echo "$as_me:5876: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5876: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5878: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -5881,7 +5883,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				([34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5884: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5886: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5891,7 +5893,7 @@ echo "${as_me:-configure}:5884: testing feature is broken in gcc $GCC_VERSION ..
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:5894: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5896: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5908,7 +5910,7 @@ fi
 
 fi
 
-echo "$as_me:5911: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:5913: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -5930,7 +5932,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:5933: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:5935: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6044,23 +6046,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:6047: checking for dbmalloc.h" >&5
+	echo "$as_me:6049: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6053 "configure"
+#line 6055 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6057: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6059: \"$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:6063: \$? = $ac_status" >&5
+  echo "$as_me:6065: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6079,11 +6081,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6082: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:6084: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test "$ac_cv_header_dbmalloc_h" = yes; then
 
-echo "$as_me:6086: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:6088: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6091,7 +6093,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6094 "configure"
+#line 6096 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6110,16 +6112,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6116: \$? = $ac_status" >&5
+  echo "$as_me:6118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6122: \$? = $ac_status" >&5
+  echo "$as_me:6124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6130,7 +6132,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6133: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:6135: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then
   cat >>confdefs.h <<EOF
@@ -6145,7 +6147,7 @@ fi
 
 fi
 
-echo "$as_me:6148: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6150: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -6167,7 +6169,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6170: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6172: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6281,23 +6283,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6284: checking for dmalloc.h" >&5
+	echo "$as_me:6286: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 6290 "configure"
+#line 6292 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6294: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6296: \"$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:6300: \$? = $ac_status" >&5
+  echo "$as_me:6302: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6316,11 +6318,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6319: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:6321: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test "$ac_cv_header_dmalloc_h" = yes; then
 
-echo "$as_me:6323: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:6325: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6328,7 +6330,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6331 "configure"
+#line 6333 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6347,16 +6349,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6353: \$? = $ac_status" >&5
+  echo "$as_me:6355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6359: \$? = $ac_status" >&5
+  echo "$as_me:6361: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6367,7 +6369,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6370: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:6372: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then
   cat >>confdefs.h <<EOF
@@ -6407,7 +6409,7 @@ case "$host_os" in
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:6410: checking for strcmp in -lc_s" >&5
+echo "$as_me:6412: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6415,7 +6417,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6418 "configure"
+#line 6420 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6434,16 +6436,16 @@ strcmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6440: \$? = $ac_status" >&5
+  echo "$as_me:6442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6446: \$? = $ac_status" >&5
+  echo "$as_me:6448: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -6454,7 +6456,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6457: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:6459: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test "$ac_cv_lib_c_s_strcmp" = yes; then
   cat >>confdefs.h <<EOF
@@ -6634,14 +6636,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:6637: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:6639: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 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:6644: checking for $ac_word" >&5
+echo "$as_me:6646: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6656,7 +6658,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_CC="$ac_prog"
-echo "$as_me:6659: found $ac_dir/$ac_word" >&5
+echo "$as_me:6661: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6664,10 +6666,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:6667: result: $CC" >&5
+  echo "$as_me:6669: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:6670: result: no" >&5
+  echo "$as_me:6672: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6690,23 +6692,23 @@ test -n "$CC" || CC="$CC"
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6693: checking for $ac_header" >&5
+echo "$as_me:6695: 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 6699 "configure"
+#line 6701 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6703: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6705: \"$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:6709: \$? = $ac_status" >&5
+  echo "$as_me:6711: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6725,7 +6727,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6728: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6730: 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
@@ -6753,23 +6755,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6756: checking for $ac_header" >&5
+echo "$as_me:6758: 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 6762 "configure"
+#line 6764 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6766: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6768: \"$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:6772: \$? = $ac_status" >&5
+  echo "$as_me:6774: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6788,7 +6790,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6791: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6793: 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
@@ -6815,13 +6817,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:6818: checking \$CFLAGS variable" >&5
+echo "$as_me:6820: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:6822: result: broken" >&5
+	echo "$as_me:6824: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6824: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:6826: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 	cf_flags="$CFLAGS"
 	CFLAGS=
@@ -6929,18 +6931,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:6932: result: ok" >&5
+	echo "$as_me:6934: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:6937: checking \$CC variable" >&5
+echo "$as_me:6939: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:6941: result: broken" >&5
+	echo "$as_me:6943: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6943: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:6945: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
@@ -7057,24 +7059,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:7060: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:7062: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7064: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7066: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7068: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7070: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:7072: result: ok" >&5
+	echo "$as_me:7074: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:7077: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:7079: checking for ${CC:-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7198,7 +7200,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7201 "configure"
+#line 7203 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -7219,16 +7221,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7224: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7225: \$? = $ac_status" >&5
+  echo "$as_me:7227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7231: \$? = $ac_status" >&5
+  echo "$as_me:7233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -7241,7 +7243,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:7244: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:7246: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -7355,7 +7357,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:7358: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:7360: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -7375,7 +7377,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:7378: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:7380: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7387,7 +7389,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >"conftest.$ac_ext" <<_ACEOF
-#line 7390 "configure"
+#line 7392 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7407,16 +7409,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7413: \$? = $ac_status" >&5
+  echo "$as_me:7415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7419: \$? = $ac_status" >&5
+  echo "$as_me:7421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7426,16 +7428,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7432: \$? = $ac_status" >&5
+  echo "$as_me:7434: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7438: \$? = $ac_status" >&5
+  echo "$as_me:7440: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -7449,13 +7451,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:7452: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7454: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:7458: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:7460: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7463,7 +7465,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7466 "configure"
+#line 7468 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7483,16 +7485,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7489: \$? = $ac_status" >&5
+  echo "$as_me:7491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7495: \$? = $ac_status" >&5
+  echo "$as_me:7497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7501,7 +7503,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7504 "configure"
+#line 7506 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -7522,16 +7524,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7528: \$? = $ac_status" >&5
+  echo "$as_me:7530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7534: \$? = $ac_status" >&5
+  echo "$as_me:7536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -7542,7 +7544,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7545: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7547: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -7552,7 +7554,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:7555: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:7557: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7560,7 +7562,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7563 "configure"
+#line 7565 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7580,16 +7582,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7586: \$? = $ac_status" >&5
+  echo "$as_me:7588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7592: \$? = $ac_status" >&5
+  echo "$as_me:7594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7598,7 +7600,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7601 "configure"
+#line 7603 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -7619,16 +7621,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7622: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7625: \$? = $ac_status" >&5
+  echo "$as_me:7627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7631: \$? = $ac_status" >&5
+  echo "$as_me:7633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -7639,7 +7641,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7642: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7644: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -7652,7 +7654,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:7655: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:7657: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7660,7 +7662,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7663 "configure"
+#line 7665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7672,16 +7674,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7678: \$? = $ac_status" >&5
+  echo "$as_me:7680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7684: \$? = $ac_status" >&5
+  echo "$as_me:7686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7690,7 +7692,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7693 "configure"
+#line 7695 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -7703,16 +7705,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7708: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7709: \$? = $ac_status" >&5
+  echo "$as_me:7711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7715: \$? = $ac_status" >&5
+  echo "$as_me:7717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -7723,7 +7725,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7726: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7728: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -7737,13 +7739,13 @@ rm -rf conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:7740: checking for fseeko" >&5
+echo "$as_me:7742: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7746 "configure"
+#line 7748 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7755,16 +7757,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7760: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7761: \$? = $ac_status" >&5
+  echo "$as_me:7763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7767: \$? = $ac_status" >&5
+  echo "$as_me:7769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -7774,7 +7776,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7777: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7779: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -7813,14 +7815,14 @@ fi
 
 	fi
 
-	echo "$as_me:7816: checking whether to use struct dirent64" >&5
+	echo "$as_me:7818: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7823 "configure"
+#line 7825 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -7843,16 +7845,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7846: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7848: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7849: \$? = $ac_status" >&5
+  echo "$as_me:7851: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7854: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7855: \$? = $ac_status" >&5
+  echo "$as_me:7857: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -7863,7 +7865,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7866: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7868: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -7875,20 +7877,20 @@ EOF
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-	echo "$as_me:7878: checking for PATH separator" >&5
+	echo "$as_me:7880: checking for PATH separator" >&5
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(os2*)	PATH_SEPARATOR=';'  ;;
 	(*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 
-	echo "$as_me:7885: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:7887: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # Extract the first word of "msginit", so it can be a program name with args.
 
 set dummy msginit; ac_word=$2
-echo "$as_me:7891: checking for $ac_word" >&5
+echo "$as_me:7893: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGINIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7915,17 +7917,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:7918: result: $MSGINIT" >&5
+  echo "$as_me:7920: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:7921: result: no" >&5
+  echo "$as_me:7923: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$MSGINIT" != ":" ; then
 		test -n "$verbose" && echo "	adding en.po" 1>&6
 
-echo "${as_me:-configure}:7928: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:7930: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -7934,7 +7936,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:7937: checking for $ac_word" >&5
+echo "$as_me:7939: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7949,7 +7951,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_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:7952: found $ac_dir/$ac_word" >&5
+echo "$as_me:7954: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7957,10 +7959,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:7960: result: $RANLIB" >&5
+  echo "$as_me:7962: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:7963: result: no" >&5
+  echo "$as_me:7965: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7969,7 +7971,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:7972: checking for $ac_word" >&5
+echo "$as_me:7974: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7984,7 +7986,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_ac_ct_RANLIB="ranlib"
-echo "$as_me:7987: found $ac_dir/$ac_word" >&5
+echo "$as_me:7989: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7993,10 +7995,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:7996: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:7998: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:7999: result: no" >&5
+  echo "$as_me:8001: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8005,13 +8007,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:8008: checking for ANSI C header files" >&5
+echo "$as_me:8010: 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 8014 "configure"
+#line 8016 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8019,13 +8021,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:8022: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8024: \"$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:8028: \$? = $ac_status" >&5
+  echo "$as_me:8030: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8047,7 +8049,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 8050 "configure"
+#line 8052 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -8065,7 +8067,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 8068 "configure"
+#line 8070 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -8086,7 +8088,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8089 "configure"
+#line 8091 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -8112,15 +8114,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8115: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8118: \$? = $ac_status" >&5
+  echo "$as_me:8120: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8123: \$? = $ac_status" >&5
+  echo "$as_me:8125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8133,7 +8135,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:8136: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8138: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8143,7 +8145,7 @@ EOF
 
 fi
 
-echo "$as_me:8146: checking for inline" >&5
+echo "$as_me:8148: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8151,7 +8153,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8154 "configure"
+#line 8156 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -8160,16 +8162,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8166: \$? = $ac_status" >&5
+  echo "$as_me:8168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8172: \$? = $ac_status" >&5
+  echo "$as_me:8174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8180,7 +8182,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8183: result: $ac_cv_c_inline" >&5
+echo "$as_me:8185: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8201,28 +8203,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8204: checking for $ac_header" >&5
+echo "$as_me:8206: 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 8210 "configure"
+#line 8212 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8218: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8219: \$? = $ac_status" >&5
+  echo "$as_me:8221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8225: \$? = $ac_status" >&5
+  echo "$as_me:8227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8232,7 +8234,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8235: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8237: 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
@@ -8242,13 +8244,13 @@ EOF
 fi
 done
 
-echo "$as_me:8245: checking for off_t" >&5
+echo "$as_me:8247: 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 8251 "configure"
+#line 8253 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8263,16 +8265,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8275: \$? = $ac_status" >&5
+  echo "$as_me:8277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8282,7 +8284,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8285: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8287: 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
   :
@@ -8294,13 +8296,13 @@ EOF
 
 fi
 
-echo "$as_me:8297: checking for size_t" >&5
+echo "$as_me:8299: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8303 "configure"
+#line 8305 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8315,16 +8317,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8320: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8321: \$? = $ac_status" >&5
+  echo "$as_me:8323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8327: \$? = $ac_status" >&5
+  echo "$as_me:8329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8334,7 +8336,7 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8337: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8339: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test "$ac_cv_type_size_t" = yes; then
   :
@@ -8348,13 +8350,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8351: checking for working alloca.h" >&5
+echo "$as_me:8353: 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 8357 "configure"
+#line 8359 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8366,16 +8368,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8372: \$? = $ac_status" >&5
+  echo "$as_me:8374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8378: \$? = $ac_status" >&5
+  echo "$as_me:8380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8385,7 +8387,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8388: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8390: 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
 
@@ -8395,13 +8397,13 @@ EOF
 
 fi
 
-echo "$as_me:8398: checking for alloca" >&5
+echo "$as_me:8400: 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 8404 "configure"
+#line 8406 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8433,16 +8435,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8439: \$? = $ac_status" >&5
+  echo "$as_me:8441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8445: \$? = $ac_status" >&5
+  echo "$as_me:8447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8452,7 +8454,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8455: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8457: 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
@@ -8473,13 +8475,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8476: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8478: 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 8482 "configure"
+#line 8484 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8497,18 +8499,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8500: result: $ac_cv_os_cray" >&5
+echo "$as_me:8502: 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:8505: checking for $ac_func" >&5
+echo "$as_me:8507: 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 8511 "configure"
+#line 8513 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8539,16 +8541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8545: \$? = $ac_status" >&5
+  echo "$as_me:8547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8551: \$? = $ac_status" >&5
+  echo "$as_me:8553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8558,7 +8560,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8561: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8563: 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
 
@@ -8572,7 +8574,7 @@ fi
   done
 fi
 
-echo "$as_me:8575: checking stack direction for C alloca" >&5
+echo "$as_me:8577: 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
@@ -8581,7 +8583,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8584 "configure"
+#line 8586 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -8604,15 +8606,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8609: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8610: \$? = $ac_status" >&5
+  echo "$as_me:8612: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8615: \$? = $ac_status" >&5
+  echo "$as_me:8617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8624,7 +8626,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8627: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8629: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8636,23 +8638,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8639: checking for $ac_header" >&5
+echo "$as_me:8641: 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 8645 "configure"
+#line 8647 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8649: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8651: \"$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:8655: \$? = $ac_status" >&5
+  echo "$as_me:8657: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8671,7 +8673,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8674: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8676: 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
@@ -8684,13 +8686,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8687: checking for $ac_func" >&5
+echo "$as_me:8689: 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 8693 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8721,16 +8723,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8727: \$? = $ac_status" >&5
+  echo "$as_me:8729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8733: \$? = $ac_status" >&5
+  echo "$as_me:8735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8740,7 +8742,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8743: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8745: 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
@@ -8750,7 +8752,7 @@ EOF
 fi
 done
 
-echo "$as_me:8753: checking for working mmap" >&5
+echo "$as_me:8755: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8759,7 +8761,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8762 "configure"
+#line 8764 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -8886,15 +8888,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8892: \$? = $ac_status" >&5
+  echo "$as_me:8894: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8896: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8897: \$? = $ac_status" >&5
+  echo "$as_me:8899: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -8906,7 +8908,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8909: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:8911: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -8917,13 +8919,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:8920: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:8922: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8926 "configure"
+#line 8928 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -8943,7 +8945,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8946: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:8948: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
 	GLIBC21="$ac_cv_gnu_library_2_1"
@@ -8956,7 +8958,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" &
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:8959: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:8961: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -8973,23 +8975,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8976: checking for $ac_header" >&5
+echo "$as_me:8978: 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 8982 "configure"
+#line 8984 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8986: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8988: \"$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:8992: \$? = $ac_status" >&5
+  echo "$as_me:8994: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9008,7 +9010,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9011: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9013: 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
@@ -9023,13 +9025,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:9026: checking for $ac_func" >&5
+echo "$as_me:9028: 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 9032 "configure"
+#line 9034 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9060,16 +9062,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9066: \$? = $ac_status" >&5
+  echo "$as_me:9068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9072: \$? = $ac_status" >&5
+  echo "$as_me:9074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9079,7 +9081,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9082: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9084: 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
@@ -9130,7 +9132,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9133 "configure"
+#line 9135 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9142,16 +9144,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9148: \$? = $ac_status" >&5
+  echo "$as_me:9150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9154: \$? = $ac_status" >&5
+  echo "$as_me:9156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9168,7 +9170,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}:9171: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9173: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9214,7 +9216,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9217 "configure"
+#line 9219 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9226,16 +9228,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9229: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9232: \$? = $ac_status" >&5
+  echo "$as_me:9234: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9238: \$? = $ac_status" >&5
+  echo "$as_me:9240: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9252,7 +9254,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}:9255: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9257: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9270,7 +9272,7 @@ echo "${as_me:-configure}:9255: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:9273: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9275: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9295,7 +9297,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}:9298: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9300: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9324,7 +9326,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}:9327: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9329: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9333,7 +9335,7 @@ echo "${as_me:-configure}:9327: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:9336: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9338: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9344,7 +9346,7 @@ esac
 
 fi;
 
-  echo "$as_me:9347: checking for iconv" >&5
+  echo "$as_me:9349: 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
@@ -9355,12 +9357,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:9358: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9360: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9363 "configure"
+#line 9365 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9379,16 +9381,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9385: \$? = $ac_status" >&5
+  echo "$as_me:9387: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9391: \$? = $ac_status" >&5
+  echo "$as_me:9393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9402,7 +9404,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9405 "configure"
+#line 9407 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9421,16 +9423,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9427: \$? = $ac_status" >&5
+  echo "$as_me:9429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9433: \$? = $ac_status" >&5
+  echo "$as_me:9435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9447,9 +9449,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:9450: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:9452: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:9452: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9454: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9540,7 +9542,7 @@ 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}:9543: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9545: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -9548,7 +9550,7 @@ echo "${as_me:-configure}:9543: testing ... testing $cf_cv_header_path_iconv ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9551 "configure"
+#line 9553 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9567,21 +9569,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9573: \$? = $ac_status" >&5
+  echo "$as_me:9575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9579: \$? = $ac_status" >&5
+  echo "$as_me:9581: \$? = $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}:9584: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9586: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9599,7 +9601,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:9602: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9604: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -9674,13 +9676,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}:9677: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9679: 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 9683 "configure"
+#line 9685 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9699,21 +9701,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9704: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9707: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9711: \$? = $ac_status" >&5
+  echo "$as_me:9713: \$? = $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}:9716: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9718: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -9753,7 +9755,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:9756: result: $am_cv_func_iconv" >&5
+echo "$as_me:9758: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -9762,14 +9764,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:9765: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:9767: 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 9772 "configure"
+#line 9774 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9794,16 +9796,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9800: \$? = $ac_status" >&5
+  echo "$as_me:9802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9806: \$? = $ac_status" >&5
+  echo "$as_me:9808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -9813,7 +9815,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9816: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:9818: 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
@@ -9858,7 +9860,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9861 "configure"
+#line 9863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9870,16 +9872,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9873: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9876: \$? = $ac_status" >&5
+  echo "$as_me:9878: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9882: \$? = $ac_status" >&5
+  echo "$as_me:9884: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9896,7 +9898,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}:9899: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9901: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9935,7 +9937,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}:9938: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9940: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9946,13 +9948,13 @@ fi
     fi
   fi
 
-echo "$as_me:9949: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9951: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9955 "configure"
+#line 9957 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -9964,16 +9966,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:9972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9976: \$? = $ac_status" >&5
+  echo "$as_me:9978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -9984,7 +9986,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9987: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:9989: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -9995,13 +9997,13 @@ EOF
 	fi
 
    if test "$ac_cv_header_locale_h" = yes; then
-	echo "$as_me:9998: checking for LC_MESSAGES" >&5
+	echo "$as_me:10000: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10004 "configure"
+#line 10006 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -10013,16 +10015,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10018: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10019: \$? = $ac_status" >&5
+  echo "$as_me:10021: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
+  echo "$as_me:10027: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -10032,7 +10034,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10035: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:10037: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
 	if test "$am_cv_val_LC_MESSAGES" = yes; then
 
@@ -10042,7 +10044,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:10045: checking whether NLS is requested" >&5
+   echo "$as_me:10047: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -10052,7 +10054,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:10055: result: $USE_NLS" >&5
+  echo "$as_me:10057: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -10066,7 +10068,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:10069: checking whether included gettext is requested" >&5
+    echo "$as_me:10071: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -10076,13 +10078,13 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:10079: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:10081: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:10085: checking for $ac_word" >&5
+echo "$as_me:10087: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10109,16 +10111,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:10112: result: $MSGFMT" >&5
+  echo "$as_me:10114: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:10115: result: no" >&5
+  echo "$as_me:10117: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:10121: checking for $ac_word" >&5
+echo "$as_me:10123: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10135,7 +10137,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:10138: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10140: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10147,17 +10149,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:10150: result: $GMSGFMT" >&5
+  echo "$as_me:10152: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:10153: result: no" >&5
+  echo "$as_me:10155: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
         # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:10160: checking for $ac_word" >&5
+echo "$as_me:10162: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10184,10 +10186,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:10187: result: $XGETTEXT" >&5
+  echo "$as_me:10189: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:10190: result: no" >&5
+  echo "$as_me:10192: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10325,12 +10327,12 @@ fi
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:10328: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10330: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10333 "configure"
+#line 10335 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10352,16 +10354,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10355: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10358: \$? = $ac_status" >&5
+  echo "$as_me:10360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10364: \$? = $ac_status" >&5
+  echo "$as_me:10366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10375,7 +10377,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10378 "configure"
+#line 10380 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10397,16 +10399,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10403: \$? = $ac_status" >&5
+  echo "$as_me:10405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10409: \$? = $ac_status" >&5
+  echo "$as_me:10411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10423,9 +10425,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:10426: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:10428: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:10428: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10430: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10516,7 +10518,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_intl" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:10519: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10521: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -10524,7 +10526,7 @@ echo "${as_me:-configure}:10519: testing ... testing $cf_cv_header_path_intl ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10527 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10546,21 +10548,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10552: \$? = $ac_status" >&5
+  echo "$as_me:10554: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10558: \$? = $ac_status" >&5
+  echo "$as_me:10560: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me:-configure}:10563: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10565: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10578,7 +10580,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:10581: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10583: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -10653,13 +10655,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_intl" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:10656: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10658: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lintl  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 10662 "configure"
+#line 10664 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10681,21 +10683,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10686: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10687: \$? = $ac_status" >&5
+  echo "$as_me:10689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10693: \$? = $ac_status" >&5
+  echo "$as_me:10695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me:-configure}:10698: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10700: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -10734,9 +10736,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-      echo "$as_me:10737: checking for libintl.h and gettext()" >&5
+      echo "$as_me:10739: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-      echo "$as_me:10739: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:10741: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       LIBS="$cf_save_LIBS_1"
@@ -10781,7 +10783,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10784 "configure"
+#line 10786 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10793,16 +10795,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10799: \$? = $ac_status" >&5
+  echo "$as_me:10801: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10805: \$? = $ac_status" >&5
+  echo "$as_me:10807: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10819,7 +10821,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}:10822: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10824: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10858,7 +10860,7 @@ if test -n "$cf_cv_library_path_intl" ; 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}:10861: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10863: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -10874,13 +10876,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10877: checking for $ac_func" >&5
+echo "$as_me:10879: 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 10883 "configure"
+#line 10885 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10911,16 +10913,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10917: \$? = $ac_status" >&5
+  echo "$as_me:10919: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10923: \$? = $ac_status" >&5
+  echo "$as_me:10925: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10930,7 +10932,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10933: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10935: 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
@@ -10945,7 +10947,7 @@ done
           CATOBJEXT=.gmo
         fi
       elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-        { echo "$as_me:10948: WARNING: disabling NLS feature" >&5
+        { echo "$as_me:10950: WARNING: disabling NLS feature" >&5
 echo "$as_me: WARNING: disabling NLS feature" >&2;}
         sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
         mv confdefs.tmp confdefs.h
@@ -10981,7 +10983,7 @@ EOF
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       elif test "$nls_cv_use_gnu_gettext" = "yes"; then
         nls_cv_use_gnu_gettext=no
-        { echo "$as_me:10984: WARNING: no NLS library is packaged with this application" >&5
+        { echo "$as_me:10986: WARNING: no NLS library is packaged with this application" >&5
 echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       fi
     fi
@@ -10990,7 +10992,7 @@ echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:10993: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:10995: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -10999,7 +11001,7 @@ echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:11002: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:11004: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -11017,7 +11019,7 @@ echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
 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:11020: checking for $ac_word" >&5
+echo "$as_me:11022: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTL_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11032,7 +11034,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_INTL_YACC="$ac_prog"
-echo "$as_me:11035: found $ac_dir/$ac_word" >&5
+echo "$as_me:11037: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11040,10 +11042,10 @@ fi
 fi
 INTL_YACC=$ac_cv_prog_INTL_YACC
 if test -n "$INTL_YACC"; then
-  echo "$as_me:11043: result: $INTL_YACC" >&5
+  echo "$as_me:11045: result: $INTL_YACC" >&5
 echo "${ECHO_T}$INTL_YACC" >&6
 else
-  echo "$as_me:11046: result: no" >&5
+  echo "$as_me:11048: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11053,7 +11055,7 @@ done
       if test -z "$INTL_YACC"; then
         ac_verc_fail=yes
       else
-                echo "$as_me:11056: checking version of $INTL_YACC" >&5
+                echo "$as_me:11058: checking version of $INTL_YACC" >&5
 echo $ECHO_N "checking version of $INTL_YACC... $ECHO_C" >&6
         ac_prog_version=`$INTL_YACC -V 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p;s/^\(byacc\) - \([0-9][0-9.]*\) \([0-9]*\).*$/\1-\2.\3/p'`
         case "$ac_prog_version" in
@@ -11064,7 +11066,7 @@ echo $ECHO_N "checking version of $INTL_YACC... $ECHO_C" >&6
              ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
           (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
         esac
-      echo "$as_me:11067: result: $ac_prog_version" >&5
+      echo "$as_me:11069: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
       fi
       if test "$ac_verc_fail" = yes; then
@@ -11091,7 +11093,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:11094: checking for catalogs to be installed" >&5
+       echo "$as_me:11096: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -11111,7 +11113,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:11114: result: $LINGUAS" >&5
+       echo "$as_me:11116: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -11147,7 +11149,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d "$srcdir/po" ; then
-echo "$as_me:11150: checking if we should use included message-library" >&5
+echo "$as_me:11152: 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.
@@ -11158,7 +11160,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:11161: result: $use_our_messages" >&5
+echo "$as_me:11163: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -11200,23 +11202,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11203: checking for $ac_header" >&5
+echo "$as_me:11205: 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 11209 "configure"
+#line 11211 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11213: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11215: \"$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:11219: \$? = $ac_status" >&5
+  echo "$as_me:11221: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11235,7 +11237,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11238: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11240: 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
@@ -11324,7 +11326,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:11327: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:11329: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11333,7 +11335,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:11336: checking if you want full utility pathnames" >&5
+echo "$as_me:11338: 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.
@@ -11350,14 +11352,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:11353: result: $with_full_paths" >&5
+echo "$as_me:11355: 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:11360: checking for system mailer" >&5
+echo "$as_me:11362: 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
@@ -11377,14 +11379,14 @@ else
 
 fi
 
-echo "$as_me:11380: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:11382: 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:11387: checking system mail flags" >&5
+echo "$as_me:11389: 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
@@ -11400,7 +11402,7 @@ else
 
 fi
 
-echo "$as_me:11403: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:11405: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -11413,14 +11415,14 @@ if test "$with_full_paths" = no ; then
 fi
 fi
 
-echo "$as_me:11416: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:11418: checking if the POSIX test-macros are already defined" >&5
 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
 if test "${cf_cv_posix_visible+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11423 "configure"
+#line 11425 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11439,16 +11441,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11445: \$? = $ac_status" >&5
+  echo "$as_me:11447: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11451: \$? = $ac_status" >&5
+  echo "$as_me:11453: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -11459,7 +11461,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11462: result: $cf_cv_posix_visible" >&5
+echo "$as_me:11464: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -11504,14 +11506,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:11507: checking if this is the GNU C library" >&5
+echo "$as_me:11509: checking if this is the GNU C library" >&5
 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
 if test "${cf_cv_gnu_library+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11514 "configure"
+#line 11516 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11530,16 +11532,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11536: \$? = $ac_status" >&5
+  echo "$as_me:11538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11542: \$? = $ac_status" >&5
+  echo "$as_me:11544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -11550,7 +11552,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11553: result: $cf_cv_gnu_library" >&5
+echo "$as_me:11555: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -11558,7 +11560,7 @@ if test x$cf_cv_gnu_library = xyes; then
 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
 	# was changed to help a little.  newlib incorporated the change about 4
 	# years later.
-	echo "$as_me:11561: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:11563: checking if _DEFAULT_SOURCE can be used as a basis" >&5
 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
 if test "${cf_cv_gnu_library_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11570,7 +11572,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11573 "configure"
+#line 11575 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11589,16 +11591,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11594: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11595: \$? = $ac_status" >&5
+  echo "$as_me:11597: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11601: \$? = $ac_status" >&5
+  echo "$as_me:11603: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -11610,12 +11612,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:11613: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:11615: result: $cf_cv_gnu_library_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
 
 	if test "x$cf_cv_gnu_library_219" = xyes; then
 		cf_save="$CPPFLAGS"
-		echo "$as_me:11618: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:11620: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11720,7 +11722,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11723 "configure"
+#line 11725 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11740,16 +11742,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11745: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11746: \$? = $ac_status" >&5
+  echo "$as_me:11748: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11752: \$? = $ac_status" >&5
+  echo "$as_me:11754: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11760,7 +11762,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11763: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11765: result: $cf_cv_gnu_dftsrc_219" >&5
 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
 	else
@@ -11769,14 +11771,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11772: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11774: 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 11779 "configure"
+#line 11781 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11791,16 +11793,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11796: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11797: \$? = $ac_status" >&5
+  echo "$as_me:11799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11803: \$? = $ac_status" >&5
+  echo "$as_me:11805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11907,7 +11909,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11910 "configure"
+#line 11912 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11922,16 +11924,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11928: \$? = $ac_status" >&5
+  echo "$as_me:11930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11934: \$? = $ac_status" >&5
+  echo "$as_me:11936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11946,12 +11948,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11949: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11951: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 
 		if test "$cf_cv_gnu_source" = yes
 		then
-		echo "$as_me:11954: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11956: checking if we should also define _DEFAULT_SOURCE" >&5
 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_default_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11961,7 +11963,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11964 "configure"
+#line 11966 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11976,16 +11978,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11982: \$? = $ac_status" >&5
+  echo "$as_me:11984: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11988: \$? = $ac_status" >&5
+  echo "$as_me:11990: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -11996,7 +11998,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11999: result: $cf_cv_default_source" >&5
+echo "$as_me:12001: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -12033,16 +12035,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:12036: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12038: 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}:12042: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12044: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12045 "configure"
+#line 12047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12057,16 +12059,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12063: \$? = $ac_status" >&5
+  echo "$as_me:12065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12069: \$? = $ac_status" >&5
+  echo "$as_me:12071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12087,7 +12089,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12090 "configure"
+#line 12092 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12102,16 +12104,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12105: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12108: \$? = $ac_status" >&5
+  echo "$as_me:12110: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12114: \$? = $ac_status" >&5
+  echo "$as_me:12116: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12122,7 +12124,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12125: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12127: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12130,10 +12132,10 @@ echo "${as_me:-configure}:12125: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12133: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12135: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12136 "configure"
+#line 12138 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12148,16 +12150,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12154: \$? = $ac_status" >&5
+  echo "$as_me:12156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12160: \$? = $ac_status" >&5
+  echo "$as_me:12162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12173,7 +12175,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12176: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12178: 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
@@ -12290,7 +12292,7 @@ fi # cf_cv_posix_visible
 	# OpenBSD 6.x has broken locale support, both compile-time and runtime.
 	# see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html
 	# Abusing the conformance level is a workaround.
-	{ echo "$as_me:12293: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:12295: WARNING: this system does not provide usable locale support" >&5
 echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	cf_xopen_source="-D_BSD_SOURCE"
 	cf_XOPEN_SOURCE=700
@@ -12322,14 +12324,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:12325: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12327: 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 12332 "configure"
+#line 12334 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12349,16 +12351,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12352: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12355: \$? = $ac_status" >&5
+  echo "$as_me:12357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12361: \$? = $ac_status" >&5
+  echo "$as_me:12363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12370,7 +12372,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12373 "configure"
+#line 12375 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12390,16 +12392,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12395: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12396: \$? = $ac_status" >&5
+  echo "$as_me:12398: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12402: \$? = $ac_status" >&5
+  echo "$as_me:12404: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12414,7 +12416,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12417: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12419: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12574,16 +12576,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:12577: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12579: 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}:12583: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12585: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12586 "configure"
+#line 12588 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12598,16 +12600,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12604: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12610: \$? = $ac_status" >&5
+  echo "$as_me:12612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12628,7 +12630,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12631 "configure"
+#line 12633 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12643,16 +12645,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12649: \$? = $ac_status" >&5
+  echo "$as_me:12651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12655: \$? = $ac_status" >&5
+  echo "$as_me:12657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12663,7 +12665,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12666: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12668: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12671,10 +12673,10 @@ echo "${as_me:-configure}:12666: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12674: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12676: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12677 "configure"
+#line 12679 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12689,16 +12691,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12695: \$? = $ac_status" >&5
+  echo "$as_me:12697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12701: \$? = $ac_status" >&5
+  echo "$as_me:12703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12714,7 +12716,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12717: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12719: 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
@@ -12826,10 +12828,10 @@ fi # cf_cv_posix_visible
 	# Some of these niche implementations use copy/paste, double-check...
 	test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE inteferes" 1>&6
 
-echo "${as_me:-configure}:12829: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
+echo "${as_me:-configure}:12831: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12832 "configure"
+#line 12834 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -12849,23 +12851,23 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12855: \$? = $ac_status" >&5
+  echo "$as_me:12857: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12861: \$? = $ac_status" >&5
+  echo "$as_me:12863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-		{ echo "$as_me:12868: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+		{ echo "$as_me:12870: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
 echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;}
 		CPPFLAGS="$cf_save_xopen_cppflags"
 fi
@@ -12887,7 +12889,7 @@ do
 	test "$CFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12890: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12892: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12899,7 +12901,7 @@ do
 	test "$CPPFLAGS" != "$cf_old_cflag" || break
 	test -n "$verbose" && echo "	removing old option $cf_add_cflags from CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:12902: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12904: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12987,7 +12989,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}:12990: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12992: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12997,7 +12999,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}:13000: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13002: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13007,7 +13009,7 @@ 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}:13010: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13012: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -13019,10 +13021,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:13022: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:13024: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13025 "configure"
+#line 13027 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -13037,16 +13039,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13042: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13043: \$? = $ac_status" >&5
+  echo "$as_me:13045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13049: \$? = $ac_status" >&5
+  echo "$as_me:13051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -13055,12 +13057,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13058: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:13060: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test "$cf_XOPEN_SOURCE_set" = yes
 	then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 13063 "configure"
+#line 13065 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -13075,16 +13077,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13081: \$? = $ac_status" >&5
+  echo "$as_me:13083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13087: \$? = $ac_status" >&5
+  echo "$as_me:13089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -13095,19 +13097,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:13098: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:13100: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:13103: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13105: 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 13110 "configure"
+#line 13112 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13127,16 +13129,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13133: \$? = $ac_status" >&5
+  echo "$as_me:13135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13139: \$? = $ac_status" >&5
+  echo "$as_me:13141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13148,7 +13150,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13151 "configure"
+#line 13153 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13168,16 +13170,16 @@ make an error
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13171: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13174: \$? = $ac_status" >&5
+  echo "$as_me:13176: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13180: \$? = $ac_status" >&5
+  echo "$as_me:13182: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13192,7 +13194,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13195: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13197: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13339,14 +13341,14 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:13342: checking if SIGWINCH is defined" >&5
+echo "$as_me:13344: 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 13349 "configure"
+#line 13351 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13361,23 +13363,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13367: \$? = $ac_status" >&5
+  echo "$as_me:13369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13373: \$? = $ac_status" >&5
+  echo "$as_me:13375: \$? = $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 13380 "configure"
+#line 13382 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13395,16 +13397,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13401: \$? = $ac_status" >&5
+  echo "$as_me:13403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13407: \$? = $ac_status" >&5
+  echo "$as_me:13409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -13418,11 +13420,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13421: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:13423: 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:13425: checking for actual SIGWINCH definition" >&5
+echo "$as_me:13427: 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
@@ -13433,7 +13435,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13436 "configure"
+#line 13438 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13455,16 +13457,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13460: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13461: \$? = $ac_status" >&5
+  echo "$as_me:13463: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13467: \$? = $ac_status" >&5
+  echo "$as_me:13469: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -13478,7 +13480,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:13481: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:13483: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -13490,7 +13492,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13493: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13495: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -13575,7 +13577,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}:13578: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13580: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13585,7 +13587,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}:13588: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13590: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13595,7 +13597,7 @@ 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}:13598: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13600: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -13604,7 +13606,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13607 "configure"
+#line 13609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13616,16 +13618,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13619: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13621: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13622: \$? = $ac_status" >&5
+  echo "$as_me:13624: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13628: \$? = $ac_status" >&5
+  echo "$as_me:13630: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13633,12 +13635,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13636: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13638: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:13641: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13643: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -13650,7 +13652,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:13653: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:13655: 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
@@ -13665,10 +13667,10 @@ else
 fi;
 
 fi
-echo "$as_me:13668: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:13670: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:13671: checking if you want ssl library" >&5
+echo "$as_me:13673: 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
@@ -13683,10 +13685,10 @@ else
 fi;
 
 fi
-echo "$as_me:13686: result: $cf_cv_use_libssl" >&5
+echo "$as_me:13688: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:13689: checking if you want gnutls support" >&5
+echo "$as_me:13691: 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
@@ -13701,11 +13703,11 @@ else
 fi;
 
 fi
-echo "$as_me:13704: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:13706: 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:13708: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:13710: 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
@@ -13720,10 +13722,10 @@ else
 fi;
 
 fi
-echo "$as_me:13723: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:13725: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:13726: checking if you want socks library" >&5
+echo "$as_me:13728: 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
@@ -13738,10 +13740,10 @@ else
 fi;
 
 fi
-echo "$as_me:13741: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:13743: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:13744: checking if you want socks5 library" >&5
+echo "$as_me:13746: 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
@@ -13756,7 +13758,7 @@ else
 fi;
 
 fi
-echo "$as_me:13759: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:13761: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -13798,7 +13800,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13801 "configure"
+#line 13803 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13810,16 +13812,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13816: \$? = $ac_status" >&5
+  echo "$as_me:13818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13822: \$? = $ac_status" >&5
+  echo "$as_me:13824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13836,7 +13838,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}:13839: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13841: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13882,7 +13884,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13885 "configure"
+#line 13887 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13894,16 +13896,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13900: \$? = $ac_status" >&5
+  echo "$as_me:13902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13906: \$? = $ac_status" >&5
+  echo "$as_me:13908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13920,7 +13922,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}:13923: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13925: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13938,7 +13940,7 @@ echo "${as_me:-configure}:13923: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13941: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13943: 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
@@ -13963,7 +13965,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}:13966: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13968: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13992,7 +13994,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}:13995: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13997: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14001,7 +14003,7 @@ echo "${as_me:-configure}:13995: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14004: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:14006: 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
@@ -14015,12 +14017,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:14018: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14020: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14023 "configure"
+#line 14025 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14036,16 +14038,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14041: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14042: \$? = $ac_status" >&5
+  echo "$as_me:14044: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14047: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14048: \$? = $ac_status" >&5
+  echo "$as_me:14050: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -14059,7 +14061,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14062 "configure"
+#line 14064 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14075,16 +14077,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14081: \$? = $ac_status" >&5
+  echo "$as_me:14083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -14101,9 +14103,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:14104: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:14106: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:14106: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14108: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14194,7 +14196,7 @@ 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}:14197: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14199: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -14202,7 +14204,7 @@ echo "${as_me:-configure}:14197: testing ... testing $cf_cv_header_path_socks ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 14205 "configure"
+#line 14207 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14218,21 +14220,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14224: \$? = $ac_status" >&5
+  echo "$as_me:14226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14230: \$? = $ac_status" >&5
+  echo "$as_me:14232: \$? = $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}:14235: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14237: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14250,7 +14252,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:14253: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14255: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14325,13 +14327,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}:14328: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14330: 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 14334 "configure"
+#line 14336 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14347,21 +14349,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14353: \$? = $ac_status" >&5
+  echo "$as_me:14355: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14359: \$? = $ac_status" >&5
+  echo "$as_me:14361: \$? = $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}:14364: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14366: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -14423,7 +14425,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14426 "configure"
+#line 14428 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14435,16 +14437,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14441: \$? = $ac_status" >&5
+  echo "$as_me:14443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14447: \$? = $ac_status" >&5
+  echo "$as_me:14449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14461,7 +14463,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}:14464: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14466: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14497,7 +14499,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}:14500: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14502: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14522,7 +14524,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:14525: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:14527: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -14565,7 +14567,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:14568: error: cannot link with socks library" >&5
+    { { echo "$as_me:14570: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -14609,7 +14611,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14612 "configure"
+#line 14614 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14621,16 +14623,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14626: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14627: \$? = $ac_status" >&5
+  echo "$as_me:14629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14633: \$? = $ac_status" >&5
+  echo "$as_me:14635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14647,7 +14649,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}:14650: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14652: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14693,7 +14695,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14696 "configure"
+#line 14698 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14705,16 +14707,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14708: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14710: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14711: \$? = $ac_status" >&5
+  echo "$as_me:14713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14717: \$? = $ac_status" >&5
+  echo "$as_me:14719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14731,7 +14733,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}:14734: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14736: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14749,7 +14751,7 @@ echo "${as_me:-configure}:14734: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14752: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14754: 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
@@ -14774,7 +14776,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}:14777: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14779: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14803,7 +14805,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}:14806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14808: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14812,7 +14814,7 @@ echo "${as_me:-configure}:14806: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14815: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14817: 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
@@ -14845,11 +14847,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:14848: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:14850: 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 14852 "configure"
+#line 14854 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -14863,16 +14865,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14869: \$? = $ac_status" >&5
+  echo "$as_me:14871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14875: \$? = $ac_status" >&5
+  echo "$as_me:14877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -14884,7 +14886,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14887 "configure"
+#line 14889 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -14896,29 +14898,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14902: \$? = $ac_status" >&5
+  echo "$as_me:14904: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14908: \$? = $ac_status" >&5
+  echo "$as_me:14910: \$? = $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:14914: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:14916: 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:14921: result: $cf_use_socks4" >&5
+echo "$as_me:14923: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -14973,10 +14975,10 @@ EOF
 
 fi
 
-echo "$as_me:14976: checking if socks5p.h is available" >&5
+echo "$as_me:14978: 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 14979 "configure"
+#line 14981 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -14991,16 +14993,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14997: \$? = $ac_status" >&5
+  echo "$as_me:14999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15003: \$? = $ac_status" >&5
+  echo "$as_me:15005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -15009,7 +15011,7 @@ cat "conftest.$ac_ext" >&5
 cf_use_socks5p_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:15012: result: $cf_use_socks5p_h" >&5
+echo "$as_me:15014: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -15021,14 +15023,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:15024: checking for network libraries" >&5
+echo "$as_me:15026: 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:15031: result: working..." >&5
+echo "$as_me:15033: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -15040,23 +15042,23 @@ case "$host_os" in
 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:15043: checking for $ac_header" >&5
+echo "$as_me:15045: 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 15049 "configure"
+#line 15051 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15053: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15055: \"$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:15059: \$? = $ac_status" >&5
+  echo "$as_me:15061: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15075,7 +15077,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15078: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15080: 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
@@ -15110,7 +15112,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15113 "configure"
+#line 15115 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -15137,22 +15139,22 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15143: \$? = $ac_status" >&5
+  echo "$as_me:15145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15149: \$? = $ac_status" >&5
+  echo "$as_me:15151: \$? = $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:15155: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:15157: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15165,13 +15167,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:15168: checking for $ac_func" >&5
+echo "$as_me:15170: 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 15174 "configure"
+#line 15176 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15202,16 +15204,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15207: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15208: \$? = $ac_status" >&5
+  echo "$as_me:15210: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15214: \$? = $ac_status" >&5
+  echo "$as_me:15216: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15221,7 +15223,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15224: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15226: 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
@@ -15230,7 +15232,7 @@ EOF
 
 else
 
-echo "$as_me:15233: checking for gethostname in -lnsl" >&5
+echo "$as_me:15235: 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
@@ -15238,7 +15240,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15241 "configure"
+#line 15243 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15257,16 +15259,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15263: \$? = $ac_status" >&5
+  echo "$as_me:15265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15269: \$? = $ac_status" >&5
+  echo "$as_me:15271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -15277,7 +15279,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15280: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:15282: 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
 
@@ -15294,7 +15296,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:15297: checking for gethostname in -lsocket" >&5
+echo "$as_me:15299: 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
@@ -15302,7 +15304,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15305 "configure"
+#line 15307 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15321,16 +15323,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15327: \$? = $ac_status" >&5
+  echo "$as_me:15329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15333: \$? = $ac_status" >&5
+  echo "$as_me:15335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -15341,7 +15343,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15344: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:15346: 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
 
@@ -15365,7 +15367,7 @@ fi
 fi
 done
 
-	echo "$as_me:15368: checking for main in -linet" >&5
+	echo "$as_me:15370: 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
@@ -15373,7 +15375,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15376 "configure"
+#line 15378 "configure"
 #include "confdefs.h"
 
 int
@@ -15385,16 +15387,16 @@ main ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15388: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15391: \$? = $ac_status" >&5
+  echo "$as_me:15393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15397: \$? = $ac_status" >&5
+  echo "$as_me:15399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -15405,7 +15407,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15408: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:15410: 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"
@@ -15416,13 +15418,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15419: checking for $ac_func" >&5
+echo "$as_me:15421: 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 15425 "configure"
+#line 15427 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15453,16 +15455,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15459: \$? = $ac_status" >&5
+  echo "$as_me:15461: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15465: \$? = $ac_status" >&5
+  echo "$as_me:15467: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15472,7 +15474,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15475: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15477: 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
@@ -15481,7 +15483,7 @@ EOF
 
 else
 
-echo "$as_me:15484: checking for socket in -lsocket" >&5
+echo "$as_me:15486: 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
@@ -15489,7 +15491,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15492 "configure"
+#line 15494 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15508,16 +15510,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15514: \$? = $ac_status" >&5
+  echo "$as_me:15516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15520: \$? = $ac_status" >&5
+  echo "$as_me:15522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -15528,7 +15530,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15531: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:15533: 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
 
@@ -15545,7 +15547,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:15548: checking for socket in -lbsd" >&5
+echo "$as_me:15550: 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
@@ -15553,7 +15555,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15556 "configure"
+#line 15558 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15572,16 +15574,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15578: \$? = $ac_status" >&5
+  echo "$as_me:15580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15584: \$? = $ac_status" >&5
+  echo "$as_me:15586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -15592,7 +15594,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15595: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:15597: 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
 
@@ -15621,13 +15623,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15624: checking for $ac_func" >&5
+echo "$as_me:15626: 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 15630 "configure"
+#line 15632 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15658,16 +15660,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15663: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15664: \$? = $ac_status" >&5
+  echo "$as_me:15666: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15670: \$? = $ac_status" >&5
+  echo "$as_me:15672: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15677,7 +15679,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15680: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15682: 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
@@ -15686,7 +15688,7 @@ EOF
 
 else
 
-echo "$as_me:15689: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:15691: 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
@@ -15694,7 +15696,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15697 "configure"
+#line 15699 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15713,16 +15715,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15718: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15719: \$? = $ac_status" >&5
+  echo "$as_me:15721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15725: \$? = $ac_status" >&5
+  echo "$as_me:15727: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -15733,7 +15735,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15736: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:15738: 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
 
@@ -15758,13 +15760,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15761: checking for $ac_func" >&5
+echo "$as_me:15763: 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 15767 "configure"
+#line 15769 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15795,16 +15797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15801: \$? = $ac_status" >&5
+  echo "$as_me:15803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15807: \$? = $ac_status" >&5
+  echo "$as_me:15809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15814,7 +15816,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15817: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15819: 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
@@ -15823,7 +15825,7 @@ EOF
 
 else
 
-echo "$as_me:15826: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:15828: checking for inet_ntoa in -lnsl" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15831,7 +15833,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15834 "configure"
+#line 15836 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15850,16 +15852,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15856: \$? = $ac_status" >&5
+  echo "$as_me:15858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15859: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15862: \$? = $ac_status" >&5
+  echo "$as_me:15864: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -15870,7 +15872,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15873: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:15875: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 if test "$ac_cv_lib_nsl_inet_ntoa" = yes; then
 
@@ -15895,13 +15897,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15898: checking for $ac_func" >&5
+echo "$as_me:15900: 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 15904 "configure"
+#line 15906 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15932,16 +15934,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15938: \$? = $ac_status" >&5
+  echo "$as_me:15940: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15944: \$? = $ac_status" >&5
+  echo "$as_me:15946: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15951,7 +15953,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15954: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15956: 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
@@ -15960,7 +15962,7 @@ EOF
 
 else
 
-echo "$as_me:15963: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:15965: 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
@@ -15968,7 +15970,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15971 "configure"
+#line 15973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15987,16 +15989,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15993: \$? = $ac_status" >&5
+  echo "$as_me:15995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15999: \$? = $ac_status" >&5
+  echo "$as_me:16001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -16007,7 +16009,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16010: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:16012: 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
 
@@ -16032,13 +16034,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16035: checking for $ac_func" >&5
+echo "$as_me:16037: 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 16041 "configure"
+#line 16043 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16069,16 +16071,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16075: \$? = $ac_status" >&5
+  echo "$as_me:16077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16081: \$? = $ac_status" >&5
+  echo "$as_me:16083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16088,7 +16090,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16091: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16093: 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
@@ -16097,7 +16099,7 @@ EOF
 
 else
 
-echo "$as_me:16100: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:16102: 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
@@ -16105,7 +16107,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16108 "configure"
+#line 16110 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16124,16 +16126,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16130: \$? = $ac_status" >&5
+  echo "$as_me:16132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16136: \$? = $ac_status" >&5
+  echo "$as_me:16138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -16144,7 +16146,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16147: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:16149: 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
 
@@ -16201,16 +16203,17 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:16204: checking for inet_aton function" >&5
+echo "$as_me:16206: 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 16211 "configure"
+#line 16213 "configure"
 #include "confdefs.h"
 
+$ac_includes_default
 #if defined(__MINGW32__)
 
 #undef WIN32_LEAN_AND_MEAN
@@ -16243,16 +16246,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16246: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16249: \$? = $ac_status" >&5
+  echo "$as_me:16252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16255: \$? = $ac_status" >&5
+  echo "$as_me:16258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -16262,7 +16265,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16265: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:16268: 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
 
@@ -16271,16 +16274,17 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:16274: checking for inet_addr function" >&5
+    echo "$as_me:16277: 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 16281 "configure"
+#line 16284 "configure"
 #include "confdefs.h"
 
+$ac_includes_default
 #if defined(__MINGW32__)
 
 #undef WIN32_LEAN_AND_MEAN
@@ -16313,16 +16317,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16319: \$? = $ac_status" >&5
+  echo "$as_me:16323: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16325: \$? = $ac_status" >&5
+  echo "$as_me:16329: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -16332,10 +16336,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16335: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:16339: 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:16338: checking for library with inet_addr" >&5
+	echo "$as_me:16342: 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
@@ -16346,7 +16350,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16349 "configure"
+#line 16353 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16362,16 +16366,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16365: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16368: \$? = $ac_status" >&5
+  echo "$as_me:16372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16371: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16374: \$? = $ac_status" >&5
+  echo "$as_me:16378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -16385,7 +16389,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    done
 
 fi
-echo "$as_me:16388: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:16392: 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
 
@@ -16406,13 +16410,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:16409: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:16413: 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:16415: checking if you want to use pkg-config" >&5
+echo "$as_me:16419: 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.
@@ -16422,7 +16426,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:16425: result: $cf_pkg_config" >&5
+echo "$as_me:16429: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -16434,7 +16438,7 @@ case "$cf_pkg_config" in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:16437: checking for $ac_word" >&5
+echo "$as_me:16441: 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
@@ -16451,7 +16455,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:16454: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16458: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16462,10 +16466,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:16465: result: $PKG_CONFIG" >&5
+  echo "$as_me:16469: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:16468: result: no" >&5
+  echo "$as_me:16472: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16474,7 +16478,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # 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:16477: checking for $ac_word" >&5
+echo "$as_me:16481: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16491,7 +16495,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16494: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16498: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16503,10 +16507,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:16506: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:16510: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:16509: result: no" >&5
+  echo "$as_me:16513: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16549,14 +16553,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16552: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:16556: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:16559: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:16563: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -16604,7 +16608,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16607 "configure"
+#line 16611 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16616,16 +16620,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16622: \$? = $ac_status" >&5
+  echo "$as_me:16626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:16632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16642,7 +16646,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}:16645: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16649: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16688,7 +16692,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16691 "configure"
+#line 16695 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16700,16 +16704,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16706: \$? = $ac_status" >&5
+  echo "$as_me:16710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16712: \$? = $ac_status" >&5
+  echo "$as_me:16716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16726,7 +16730,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}:16729: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16733: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16744,7 +16748,7 @@ echo "${as_me:-configure}:16729: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16747: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16751: 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
@@ -16769,7 +16773,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}:16772: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16776: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16798,7 +16802,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}:16801: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16805: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16807,7 +16811,7 @@ echo "${as_me:-configure}:16801: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16810: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16814: 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
@@ -16824,15 +16828,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:16827: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:16831: checking pkg-config for $cf_try_package" >&5
 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
 				if "$PKG_CONFIG" --exists $cf_try_package ; then
 					cf_cv_pkg_ssl=$cf_try_package
-					echo "$as_me:16831: result: yes" >&5
+					echo "$as_me:16835: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:16835: result: no" >&5
+					echo "$as_me:16839: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -16976,7 +16980,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16979: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16983: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -17012,7 +17016,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:17015: checking for dlsym in -ldl" >&5
+				echo "$as_me:17019: 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
@@ -17020,7 +17024,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17023 "configure"
+#line 17027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17039,16 +17043,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17045: \$? = $ac_status" >&5
+  echo "$as_me:17049: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17051: \$? = $ac_status" >&5
+  echo "$as_me:17055: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -17059,7 +17063,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17062: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:17066: 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"
@@ -17075,12 +17079,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:17078: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17082: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17083 "configure"
+#line 17087 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17109,16 +17113,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17115: \$? = $ac_status" >&5
+  echo "$as_me:17119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17121: \$? = $ac_status" >&5
+  echo "$as_me:17125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17132,7 +17136,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17135 "configure"
+#line 17139 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17161,16 +17165,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17164: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17167: \$? = $ac_status" >&5
+  echo "$as_me:17171: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17173: \$? = $ac_status" >&5
+  echo "$as_me:17177: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17187,9 +17191,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:17190: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:17194: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:17192: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17196: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17280,7 +17284,7 @@ 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}:17283: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17287: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -17288,7 +17292,7 @@ echo "${as_me:-configure}:17283: testing ... testing $cf_cv_header_path_ssl ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 17291 "configure"
+#line 17295 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17317,21 +17321,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17320: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17324: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17323: \$? = $ac_status" >&5
+  echo "$as_me:17327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17329: \$? = $ac_status" >&5
+  echo "$as_me:17333: \$? = $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}:17334: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17338: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17349,7 +17353,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:17352: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17356: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17357,7 +17361,7 @@ echo "${as_me:-configure}:17352: testing Searching for ssl library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 17360 "configure"
+#line 17364 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17386,21 +17390,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17389: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17392: \$? = $ac_status" >&5
+  echo "$as_me:17396: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17395: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17398: \$? = $ac_status" >&5
+  echo "$as_me:17402: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:17403: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:17407: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -17481,13 +17485,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}:17484: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17488: 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 17490 "configure"
+#line 17494 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17516,21 +17520,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17522: \$? = $ac_status" >&5
+  echo "$as_me:17526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17528: \$? = $ac_status" >&5
+  echo "$as_me:17532: \$? = $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}:17533: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17537: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -17592,7 +17596,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}:17595: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17599: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17651,7 +17655,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17654 "configure"
+#line 17658 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17663,16 +17667,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17670: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17669: \$? = $ac_status" >&5
+  echo "$as_me:17673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17675: \$? = $ac_status" >&5
+  echo "$as_me:17679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17689,7 +17693,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}:17692: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17696: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17722,7 +17726,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:17725: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17729: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case "$cf_cv_header_path_ssl" in
 			(*/openssl)
@@ -17735,10 +17739,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:17738: checking for X509 support" >&5
+echo "$as_me:17742: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17741 "configure"
+#line 17745 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17767,16 +17771,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:17770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17774: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17773: \$? = $ac_status" >&5
+  echo "$as_me:17777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17779: \$? = $ac_status" >&5
+  echo "$as_me:17783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -17785,7 +17789,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:17788: result: $cf_x509_support" >&5
+echo "$as_me:17792: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17840,7 +17844,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17843 "configure"
+#line 17847 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17852,16 +17856,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17859: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17858: \$? = $ac_status" >&5
+  echo "$as_me:17862: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17864: \$? = $ac_status" >&5
+  echo "$as_me:17868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17878,7 +17882,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}:17881: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17885: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17924,7 +17928,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17927 "configure"
+#line 17931 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17936,16 +17940,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17942: \$? = $ac_status" >&5
+  echo "$as_me:17946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17948: \$? = $ac_status" >&5
+  echo "$as_me:17952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17962,7 +17966,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}:17965: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17969: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17980,7 +17984,7 @@ echo "${as_me:-configure}:17965: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:17983: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17987: 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
@@ -18005,7 +18009,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}:18008: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18012: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18034,7 +18038,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}:18037: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18041: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18043,7 +18047,7 @@ echo "${as_me:-configure}:18037: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:18046: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18050: 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
@@ -18061,12 +18065,12 @@ esac
 		(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}:18064: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:18068: 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}:18069: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18073: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -18198,7 +18202,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:18201: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:18205: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -18220,7 +18224,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:18223: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18227: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -18240,12 +18244,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:18243: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18247: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18248 "configure"
+#line 18252 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18274,16 +18278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18280: \$? = $ac_status" >&5
+  echo "$as_me:18284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18283: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18286: \$? = $ac_status" >&5
+  echo "$as_me:18290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18297,7 +18301,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18300 "configure"
+#line 18304 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18326,16 +18330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18332: \$? = $ac_status" >&5
+  echo "$as_me:18336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18338: \$? = $ac_status" >&5
+  echo "$as_me:18342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18352,9 +18356,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:18355: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:18359: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:18357: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18361: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18445,7 +18449,7 @@ 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}:18448: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18452: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -18453,7 +18457,7 @@ echo "${as_me:-configure}:18448: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 18456 "configure"
+#line 18460 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18482,21 +18486,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18488: \$? = $ac_status" >&5
+  echo "$as_me:18492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18494: \$? = $ac_status" >&5
+  echo "$as_me:18498: \$? = $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}:18499: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18503: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18514,7 +18518,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:18517: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18521: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -18589,13 +18593,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}:18592: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18596: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 18598 "configure"
+#line 18602 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18624,21 +18628,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18630: \$? = $ac_status" >&5
+  echo "$as_me:18634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18636: \$? = $ac_status" >&5
+  echo "$as_me:18640: \$? = $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}:18641: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18645: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -18718,7 +18722,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18721 "configure"
+#line 18725 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18730,16 +18734,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18736: \$? = $ac_status" >&5
+  echo "$as_me:18740: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18742: \$? = $ac_status" >&5
+  echo "$as_me:18746: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18756,7 +18760,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}:18759: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18763: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18797,7 +18801,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}:18800: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18804: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18826,13 +18830,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:18829: checking for $ac_func" >&5
+echo "$as_me:18833: 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 18835 "configure"
+#line 18839 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18863,16 +18867,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18869: \$? = $ac_status" >&5
+  echo "$as_me:18873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18875: \$? = $ac_status" >&5
+  echo "$as_me:18879: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18882,7 +18886,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18889: 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
@@ -18892,13 +18896,13 @@ EOF
 fi
 done
 
-		echo "$as_me:18895: checking for gnutls_rnd" >&5
+		echo "$as_me:18899: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 18901 "configure"
+#line 18905 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18929,16 +18933,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18936: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18935: \$? = $ac_status" >&5
+  echo "$as_me:18939: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18941: \$? = $ac_status" >&5
+  echo "$as_me:18945: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -18948,7 +18952,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18951: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18955: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test "$ac_cv_func_gnutls_rnd" = yes; then
 
@@ -18978,10 +18982,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:18981: checking for X509 support" >&5
+echo "$as_me:18985: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18984 "configure"
+#line 18988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19010,16 +19014,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:19013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19017: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19016: \$? = $ac_status" >&5
+  echo "$as_me:19020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19022: \$? = $ac_status" >&5
+  echo "$as_me:19026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -19028,7 +19032,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:19031: result: $cf_x509_support" >&5
+echo "$as_me:19035: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -19082,7 +19086,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19085 "configure"
+#line 19089 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19094,16 +19098,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19100: \$? = $ac_status" >&5
+  echo "$as_me:19104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19106: \$? = $ac_status" >&5
+  echo "$as_me:19110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19120,7 +19124,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}:19123: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19127: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19166,7 +19170,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19169 "configure"
+#line 19173 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19178,16 +19182,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19184: \$? = $ac_status" >&5
+  echo "$as_me:19188: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19194: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19204,7 +19208,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}:19207: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19211: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19222,7 +19226,7 @@ echo "${as_me:-configure}:19207: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:19225: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19229: 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
@@ -19247,7 +19251,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}:19250: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19254: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19276,7 +19280,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}:19279: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19283: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19285,7 +19289,7 @@ echo "${as_me:-configure}:19279: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:19288: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19292: 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
@@ -19303,12 +19307,12 @@ esac
 		(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}:19306: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:19310: 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}:19311: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19315: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -19440,7 +19444,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:19443: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:19447: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -19462,7 +19466,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:19465: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19469: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -19482,12 +19486,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:19485: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19489: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19490 "configure"
+#line 19494 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19516,16 +19520,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19522: \$? = $ac_status" >&5
+  echo "$as_me:19526: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19528: \$? = $ac_status" >&5
+  echo "$as_me:19532: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19539,7 +19543,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19542 "configure"
+#line 19546 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19568,16 +19572,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19574: \$? = $ac_status" >&5
+  echo "$as_me:19578: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19580: \$? = $ac_status" >&5
+  echo "$as_me:19584: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19594,9 +19598,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:19597: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:19601: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:19599: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19603: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19687,7 +19691,7 @@ 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}:19690: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19694: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -19695,7 +19699,7 @@ echo "${as_me:-configure}:19690: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19698 "configure"
+#line 19702 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19724,21 +19728,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19730: \$? = $ac_status" >&5
+  echo "$as_me:19734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19736: \$? = $ac_status" >&5
+  echo "$as_me:19740: \$? = $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}:19741: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19745: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19756,7 +19760,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:19759: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19763: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19831,13 +19835,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}:19834: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19838: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 19840 "configure"
+#line 19844 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19866,21 +19870,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19873: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19872: \$? = $ac_status" >&5
+  echo "$as_me:19876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19878: \$? = $ac_status" >&5
+  echo "$as_me:19882: \$? = $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}:19883: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19887: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -19960,7 +19964,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19963 "configure"
+#line 19967 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19972,16 +19976,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19978: \$? = $ac_status" >&5
+  echo "$as_me:19982: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19984: \$? = $ac_status" >&5
+  echo "$as_me:19988: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19998,7 +20002,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}:20001: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20005: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20039,7 +20043,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}:20042: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20046: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20068,13 +20072,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20071: checking for $ac_func" >&5
+echo "$as_me:20075: 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 20077 "configure"
+#line 20081 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20105,16 +20109,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20112: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20111: \$? = $ac_status" >&5
+  echo "$as_me:20115: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20118: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:20121: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20124,7 +20128,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20127: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20131: 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
@@ -20134,13 +20138,13 @@ EOF
 fi
 done
 
-		echo "$as_me:20137: checking for gnutls_rnd" >&5
+		echo "$as_me:20141: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20143 "configure"
+#line 20147 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20171,16 +20175,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20177: \$? = $ac_status" >&5
+  echo "$as_me:20181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20183: \$? = $ac_status" >&5
+  echo "$as_me:20187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -20190,7 +20194,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20193: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:20197: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test "$ac_cv_func_gnutls_rnd" = yes; then
 
@@ -20219,7 +20223,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:20222: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:20226: 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
@@ -20227,7 +20231,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20230 "configure"
+#line 20234 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20246,16 +20250,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20249: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20252: \$? = $ac_status" >&5
+  echo "$as_me:20256: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20258: \$? = $ac_status" >&5
+  echo "$as_me:20262: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -20266,7 +20270,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20269: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:20273: 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
 
@@ -20287,7 +20291,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20290: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:20294: 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
@@ -20295,7 +20299,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20298 "configure"
+#line 20302 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20314,16 +20318,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20317: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20320: \$? = $ac_status" >&5
+  echo "$as_me:20324: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20326: \$? = $ac_status" >&5
+  echo "$as_me:20330: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -20334,7 +20338,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20337: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:20341: 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
 
@@ -20355,7 +20359,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20358: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:20362: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20364,10 +20368,10 @@ fi
 
 			fi
 
-echo "$as_me:20367: checking for X509 support" >&5
+echo "$as_me:20371: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20370 "configure"
+#line 20374 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20396,16 +20400,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:20399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20402: \$? = $ac_status" >&5
+  echo "$as_me:20406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20405: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20408: \$? = $ac_status" >&5
+  echo "$as_me:20412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -20414,7 +20418,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:20417: result: $cf_x509_support" >&5
+echo "$as_me:20421: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -20446,7 +20450,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:20449: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:20453: 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
@@ -20454,7 +20458,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20457 "configure"
+#line 20461 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20473,16 +20477,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20479: \$? = $ac_status" >&5
+  echo "$as_me:20483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20485: \$? = $ac_status" >&5
+  echo "$as_me:20489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -20493,7 +20497,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20496: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:20500: 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
@@ -20508,11 +20512,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}:20511: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:20515: 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:20515: error: cannot find NSS compliant libraries" >&5
+			{ { echo "$as_me:20519: error: cannot find NSS compliant libraries" >&5
 echo "$as_me: error: cannot find NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -20527,13 +20531,13 @@ fi
 		elif test -d "$cf_cv_use_libnss_compat/../include" ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:20530: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:20534: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compliant 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:20536: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:20540: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -20662,10 +20666,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:20665: checking for NSS compliant include directory" >&5
+echo "$as_me:20669: checking for NSS compliant include directory" >&5
 echo $ECHO_N "checking for NSS compliant include directory... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20668 "configure"
+#line 20672 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20679,16 +20683,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20685: \$? = $ac_status" >&5
+  echo "$as_me:20689: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20691: \$? = $ac_status" >&5
+  echo "$as_me:20695: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_incl=yes
 else
@@ -20697,7 +20701,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_incl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20700: result: $cf_ssl_incl" >&5
+echo "$as_me:20704: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20706,10 +20710,10 @@ EOF
 
 fi
 
-echo "$as_me:20709: checking if we can link to NSS compliant library" >&5
+echo "$as_me:20713: checking if we can link to NSS compliant library" >&5
 echo $ECHO_N "checking if we can link to NSS compliant library... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20712 "configure"
+#line 20716 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20728,16 +20732,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20734: \$? = $ac_status" >&5
+  echo "$as_me:20738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20740: \$? = $ac_status" >&5
+  echo "$as_me:20744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_library=yes
 else
@@ -20746,7 +20750,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:20749: result: $cf_ssl_library" >&5
+echo "$as_me:20753: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -20759,7 +20763,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:20762: error: Cannot link with NSS compliant libraries" >&5
+	{ { echo "$as_me:20766: error: Cannot link with NSS compliant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20767,7 +20771,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:20770: checking whether to enable ipv6" >&5
+echo "$as_me:20774: 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.
@@ -20784,11 +20788,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:20787: result: $enableval" >&5
+echo "$as_me:20791: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:20791: checking ipv6 stack type" >&5
+echo "$as_me:20795: 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
@@ -20809,7 +20813,7 @@ do
 		;;
 	(inria)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20812 "configure"
+#line 20816 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20826,7 +20830,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20829 "configure"
+#line 20833 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20843,7 +20847,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20846 "configure"
+#line 20850 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -20869,7 +20873,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20872 "configure"
+#line 20876 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20886,7 +20890,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20889 "configure"
+#line 20893 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -20903,7 +20907,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20906 "configure"
+#line 20910 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20925,13 +20929,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:20928: result: $cf_cv_ipv6type" >&5
+echo "$as_me:20932: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:20934: checking for IPv6 library if required" >&5
+echo "$as_me:20938: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case "$cf_cv_ipv6type" in
 (solaris)
@@ -20961,13 +20965,13 @@ case "$cf_cv_ipv6type" in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:20964: result: $cf_ipv6lib" >&5
+echo "$as_me:20968: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20970 "configure"
+#line 20974 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20983,16 +20987,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20989: \$? = $ac_status" >&5
+  echo "$as_me:20993: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20995: \$? = $ac_status" >&5
+  echo "$as_me:20999: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21113,7 +21117,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21116 "configure"
+#line 21120 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21125,16 +21129,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21131: \$? = $ac_status" >&5
+  echo "$as_me:21135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21137: \$? = $ac_status" >&5
+  echo "$as_me:21141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21151,7 +21155,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}:21154: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21158: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21179,13 +21183,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:21182: checking for getaddrinfo" >&5
+	echo "$as_me:21186: 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 21188 "configure"
+#line 21192 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21216,16 +21220,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21222: \$? = $ac_status" >&5
+  echo "$as_me:21226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21228: \$? = $ac_status" >&5
+  echo "$as_me:21232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -21235,18 +21239,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21238: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:21242: 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:21245: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:21249: 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 21249 "configure"
+#line 21253 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21262,25 +21266,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21268: \$? = $ac_status" >&5
+  echo "$as_me:21272: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21274: \$? = $ac_status" >&5
+  echo "$as_me:21278: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21276: result: yes" >&5
+  echo "$as_me:21280: 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:21283: result: no" >&5
+echo "$as_me:21287: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21348,11 +21352,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21351: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:21355: 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 21355 "configure"
+#line 21359 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21368,25 +21372,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21374: \$? = $ac_status" >&5
+  echo "$as_me:21378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21380: \$? = $ac_status" >&5
+  echo "$as_me:21384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21382: result: yes" >&5
+  echo "$as_me:21386: 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:21389: result: no" >&5
+echo "$as_me:21393: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21401,7 +21405,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\"
 
 	if test "$cf_found_library" = no ; then
-		{ { echo "$as_me:21404: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:21408: 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;}
@@ -21409,7 +21413,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:21412: checking working getaddrinfo" >&5
+echo "$as_me:21416: 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
@@ -21419,7 +21423,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21422 "configure"
+#line 21426 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21499,15 +21503,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21505: \$? = $ac_status" >&5
+  echo "$as_me:21509: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21510: \$? = $ac_status" >&5
+  echo "$as_me:21514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -21520,7 +21524,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21523: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:21527: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -21536,12 +21540,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:21539: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:21543: 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:21544: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:21548: 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.
@@ -21552,7 +21556,7 @@ fi
 
 fi
 
-echo "$as_me:21555: checking for screen type" >&5
+echo "$as_me:21559: 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
@@ -21566,7 +21570,7 @@ case "$withval" in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:21569: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:21573: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21575,13 +21579,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:21578: result: $cf_cv_screen" >&5
+echo "$as_me:21582: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case "$cf_cv_screen" in
 (curses|ncurses*)
 
-echo "$as_me:21584: checking for specific curses-directory" >&5
+echo "$as_me:21588: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -21591,7 +21595,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:21594: result: $cf_cv_curses_dir" >&5
+echo "$as_me:21598: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no"
@@ -21622,7 +21626,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:21625: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:21629: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21658,7 +21662,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21661 "configure"
+#line 21665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21670,16 +21674,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21676: \$? = $ac_status" >&5
+  echo "$as_me:21680: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21682: \$? = $ac_status" >&5
+  echo "$as_me:21686: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21696,7 +21700,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}:21699: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21703: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21732,7 +21736,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}:21735: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21739: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21751,7 +21755,7 @@ dft_color_style=yes
 case "$cf_cv_screen" in
 (curses)
 
-echo "$as_me:21754: checking for extra include directories" >&5
+echo "$as_me:21758: 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
@@ -21777,7 +21781,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:21780: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:21784: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -21787,7 +21791,7 @@ then
 
 fi
 
-echo "$as_me:21790: checking if we have identified curses headers" >&5
+echo "$as_me:21794: 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
@@ -21799,28 +21803,28 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21802 "configure"
+#line 21806 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
 main (void)
 {
-initscr(); tgoto("?", 0,0)
+initscr(); endwin()
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21818: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21817: \$? = $ac_status" >&5
+  echo "$as_me:21821: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21823: \$? = $ac_status" >&5
+  echo "$as_me:21827: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21831,11 +21835,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21834: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21838: 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:21838: error: No curses header-files found" >&5
+	{ { echo "$as_me:21842: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21845,23 +21849,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:21848: checking for $ac_header" >&5
+echo "$as_me:21852: 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 21854 "configure"
+#line 21858 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21858: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21862: \"$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:21864: \$? = $ac_status" >&5
+  echo "$as_me:21868: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21880,7 +21884,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21883: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21887: 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
@@ -21890,7 +21894,7 @@ EOF
 fi
 done
 
-echo "$as_me:21893: checking for terminfo header" >&5
+echo "$as_me:21897: 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
@@ -21908,7 +21912,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21911 "configure"
+#line 21915 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21923,16 +21927,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:21933: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21935: \$? = $ac_status" >&5
+  echo "$as_me:21939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21948,7 +21952,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21951: result: $cf_cv_term_header" >&5
+echo "$as_me:21955: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21980,7 +21984,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21983: checking for ncurses version" >&5
+echo "$as_me:21987: 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
@@ -22006,10 +22010,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22009: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22013: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22012: \$? = $ac_status" >&5
+  echo "$as_me:22016: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -22019,7 +22023,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22022 "configure"
+#line 22026 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22044,15 +22048,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22050: \$? = $ac_status" >&5
+  echo "$as_me:22054: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22055: \$? = $ac_status" >&5
+  echo "$as_me:22059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22066,38 +22070,38 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:22069: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22073: 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:22076: checking if we have identified curses libraries" >&5
+echo "$as_me:22080: 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 22079 "configure"
+#line 22083 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
-initscr(); tgoto("?", 0,0)
+initscr(); endwin()
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22094: \$? = $ac_status" >&5
+  echo "$as_me:22098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22100: \$? = $ac_status" >&5
+  echo "$as_me:22104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22106,13 +22110,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:22109: result: $cf_result" >&5
+echo "$as_me:22113: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:22115: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:22119: 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
@@ -22120,7 +22124,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22123 "configure"
+#line 22127 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22139,16 +22143,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22145: \$? = $ac_status" >&5
+  echo "$as_me:22149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22148: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22151: \$? = $ac_status" >&5
+  echo "$as_me:22155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22159,7 +22163,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22162: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22166: 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
 
@@ -22189,7 +22193,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:22192: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:22196: 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
@@ -22197,7 +22201,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22200 "configure"
+#line 22204 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22216,16 +22220,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22222: \$? = $ac_status" >&5
+  echo "$as_me:22226: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22228: \$? = $ac_status" >&5
+  echo "$as_me:22232: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -22236,7 +22240,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22239: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:22243: 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
 
@@ -22260,7 +22264,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:22263: checking for initscr in -lHcurses" >&5
+		echo "$as_me:22267: 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
@@ -22268,7 +22272,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22271 "configure"
+#line 22275 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22287,16 +22291,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22290: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22294: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22293: \$? = $ac_status" >&5
+  echo "$as_me:22297: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22296: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22299: \$? = $ac_status" >&5
+  echo "$as_me:22303: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -22307,7 +22311,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22310: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:22314: 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
 
@@ -22365,7 +22369,7 @@ if test -n "/lib64" ; 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}:22368: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22372: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22394,7 +22398,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}:22397: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22401: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22425,7 +22429,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}:22428: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22432: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22460,7 +22464,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}:22463: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22467: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22504,13 +22508,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:22507: checking for tgoto" >&5
+		echo "$as_me:22511: 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 22513 "configure"
+#line 22517 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22541,16 +22545,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22547: \$? = $ac_status" >&5
+  echo "$as_me:22551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22553: \$? = $ac_status" >&5
+  echo "$as_me:22557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -22560,7 +22564,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22563: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:22567: 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
@@ -22569,7 +22573,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:22572: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:22576: 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
@@ -22577,7 +22581,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22580 "configure"
+#line 22584 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22596,16 +22600,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22602: \$? = $ac_status" >&5
+  echo "$as_me:22606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22608: \$? = $ac_status" >&5
+  echo "$as_me:22612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -22616,7 +22620,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22619: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:22623: 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
 
@@ -22639,10 +22643,10 @@ fi
 		do
 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
-				echo "$as_me:22642: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:22646: 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 22645 "configure"
+#line 22649 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22654,16 +22658,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22660: \$? = $ac_status" >&5
+  echo "$as_me:22664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22666: \$? = $ac_status" >&5
+  echo "$as_me:22670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22672,37 +22676,37 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:22675: result: $cf_result" >&5
+				echo "$as_me:22679: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" = yes && break
 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 				cf_result=no
 			elif test "$cf_term_lib" != predefined ; then
-				echo "$as_me:22681: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:22685: 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 22684 "configure"
+#line 22688 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
 main (void)
 {
-initscr(); tgoto((char *)0, 0, 0);
+initscr(); endwin();
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22699: \$? = $ac_status" >&5
+  echo "$as_me:22703: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22705: \$? = $ac_status" >&5
+  echo "$as_me:22709: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -22711,7 +22715,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 22714 "configure"
+#line 22718 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22723,16 +22727,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22730: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22729: \$? = $ac_status" >&5
+  echo "$as_me:22733: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22735: \$? = $ac_status" >&5
+  echo "$as_me:22739: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22744,19 +22748,19 @@ 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:22747: result: $cf_result" >&5
+				echo "$as_me:22751: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 				test "$cf_result" != error && break
 			fi
 		done
 	fi
-	test "$cf_curs_lib" = unknown && { { echo "$as_me:22753: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:22757: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:22759: checking for curses performance tradeoff" >&5
+echo "$as_me:22763: 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
@@ -22764,7 +22768,7 @@ else
 
     cf_cv_curs_performance=no
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 22767 "configure"
+#line 22771 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22783,20 +22787,20 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22789: \$? = $ac_status" >&5
+  echo "$as_me:22793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22795: \$? = $ac_status" >&5
+  echo "$as_me:22799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22799 "configure"
+#line 22803 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -22816,16 +22820,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22822: \$? = $ac_status" >&5
+  echo "$as_me:22826: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22828: \$? = $ac_status" >&5
+  echo "$as_me:22832: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -22840,21 +22844,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22843: result: $cf_cv_curs_performance" >&5
+echo "$as_me:22847: 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:22850: checking for curses touchline function" >&5
+echo "$as_me:22854: 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 22857 "configure"
+#line 22861 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22867,23 +22871,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22873: \$? = $ac_status" >&5
+  echo "$as_me:22877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22879: \$? = $ac_status" >&5
+  echo "$as_me:22883: \$? = $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 22886 "configure"
+#line 22890 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22896,16 +22900,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22902: \$? = $ac_status" >&5
+  echo "$as_me:22906: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22908: \$? = $ac_status" >&5
+  echo "$as_me:22912: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -22917,7 +22921,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:22920: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:22924: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -22942,23 +22946,23 @@ esac
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22945: checking for $ac_header" >&5
+echo "$as_me:22949: 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 22951 "configure"
+#line 22955 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22955: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22959: \"$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:22961: \$? = $ac_status" >&5
+  echo "$as_me:22965: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22977,7 +22981,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22980: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22984: 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
@@ -22987,7 +22991,7 @@ EOF
 fi
 done
 
-echo "$as_me:22990: checking for multibyte character support" >&5
+echo "$as_me:22994: 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
@@ -22995,7 +22999,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22998 "configure"
+#line 23002 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -23013,16 +23017,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23016: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23019: \$? = $ac_status" >&5
+  echo "$as_me:23023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23025: \$? = $ac_status" >&5
+  echo "$as_me:23029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -23034,12 +23038,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:23037: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23041: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23042 "configure"
+#line 23046 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23052,16 +23056,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23059: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23058: \$? = $ac_status" >&5
+  echo "$as_me:23062: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23064: \$? = $ac_status" >&5
+  echo "$as_me:23068: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23075,7 +23079,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23078 "configure"
+#line 23082 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23088,16 +23092,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23094: \$? = $ac_status" >&5
+  echo "$as_me:23098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23100: \$? = $ac_status" >&5
+  echo "$as_me:23104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23114,9 +23118,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:23117: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:23121: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:23119: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23123: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23207,7 +23211,7 @@ 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}:23210: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23214: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -23215,7 +23219,7 @@ echo "${as_me:-configure}:23210: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23218 "configure"
+#line 23222 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23228,21 +23232,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23234: \$? = $ac_status" >&5
+  echo "$as_me:23238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23240: \$? = $ac_status" >&5
+  echo "$as_me:23244: \$? = $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}:23245: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23249: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23260,7 +23264,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:23263: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23267: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -23335,13 +23339,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}:23338: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23342: 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 23344 "configure"
+#line 23348 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23354,21 +23358,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23360: \$? = $ac_status" >&5
+  echo "$as_me:23364: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23366: \$? = $ac_status" >&5
+  echo "$as_me:23370: \$? = $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}:23371: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23375: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -23410,7 +23414,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23413: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:23417: 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
@@ -23448,7 +23452,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 23451 "configure"
+#line 23455 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23460,16 +23464,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23463: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23466: \$? = $ac_status" >&5
+  echo "$as_me:23470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23472: \$? = $ac_status" >&5
+  echo "$as_me:23476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -23486,7 +23490,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}:23489: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23493: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23522,7 +23526,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}:23525: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23529: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -23552,13 +23556,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:23555: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:23559: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:23558: result: yes" >&5
+		echo "$as_me:23562: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:23561: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:23565: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -23691,7 +23695,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23694 "configure"
+#line 23698 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23703,37 +23707,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23709: \$? = $ac_status" >&5
+  echo "$as_me:23713: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23715: \$? = $ac_status" >&5
+  echo "$as_me:23719: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23721 "configure"
+#line 23725 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23731: \$? = $ac_status" >&5
+  echo "$as_me:23735: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23736: \$? = $ac_status" >&5
+  echo "$as_me:23740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -23907,7 +23911,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23910 "configure"
+#line 23914 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23919,37 +23923,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23925: \$? = $ac_status" >&5
+  echo "$as_me:23929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23931: \$? = $ac_status" >&5
+  echo "$as_me:23935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23937 "configure"
+#line 23941 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:23944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23947: \$? = $ac_status" >&5
+  echo "$as_me:23951: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23952: \$? = $ac_status" >&5
+  echo "$as_me:23956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -23966,7 +23970,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:23969: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23973: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -23982,7 +23986,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:23985: checking for terminfo header" >&5
+echo "$as_me:23989: 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
@@ -24000,7 +24004,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24003 "configure"
+#line 24007 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24015,16 +24019,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24021: \$? = $ac_status" >&5
+  echo "$as_me:24025: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24027: \$? = $ac_status" >&5
+  echo "$as_me:24031: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -24040,7 +24044,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24043: result: $cf_cv_term_header" >&5
+echo "$as_me:24047: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -24075,7 +24079,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:24078: result: no" >&5
+		echo "$as_me:24082: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -24091,7 +24095,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:24094: checking for $ac_word" >&5
+echo "$as_me:24098: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24106,7 +24110,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:24109: found $ac_dir/$ac_word" >&5
+echo "$as_me:24113: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24114,10 +24118,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:24117: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:24121: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24120: result: no" >&5
+  echo "$as_me:24124: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24130,7 +24134,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:24133: checking for $ac_word" >&5
+echo "$as_me:24137: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24145,7 +24149,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_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:24148: found $ac_dir/$ac_word" >&5
+echo "$as_me:24152: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24153,10 +24157,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:24156: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:24160: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24159: result: no" >&5
+  echo "$as_me:24163: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24313,7 +24317,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:24316: checking if we have identified curses headers" >&5
+echo "$as_me:24320: 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
@@ -24325,28 +24329,28 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24328 "configure"
+#line 24332 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
 main (void)
 {
-initscr(); tgoto("?", 0,0)
+initscr(); endwin()
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24344: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24343: \$? = $ac_status" >&5
+  echo "$as_me:24347: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24350: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24349: \$? = $ac_status" >&5
+  echo "$as_me:24353: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -24357,11 +24361,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24360: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:24364: 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:24364: error: No curses header-files found" >&5
+	{ { echo "$as_me:24368: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24371,23 +24375,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:24374: checking for $ac_header" >&5
+echo "$as_me:24378: 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 24380 "configure"
+#line 24384 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24384: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24388: \"$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:24390: \$? = $ac_status" >&5
+  echo "$as_me:24394: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24406,7 +24410,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24409: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24413: 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
@@ -24462,7 +24466,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24465 "configure"
+#line 24469 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24474,16 +24478,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24480: \$? = $ac_status" >&5
+  echo "$as_me:24484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24486: \$? = $ac_status" >&5
+  echo "$as_me:24490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24500,7 +24504,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}:24503: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24507: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24519,7 +24523,7 @@ fi
 
 }
 
-echo "$as_me:24522: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:24526: 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
@@ -24531,7 +24535,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24534 "configure"
+#line 24538 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24555,16 +24559,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24561: \$? = $ac_status" >&5
+  echo "$as_me:24565: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24567: \$? = $ac_status" >&5
+  echo "$as_me:24571: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -24579,14 +24583,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:24582: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:24586: 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:24589: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:24593: 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
@@ -24707,7 +24711,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24710 "configure"
+#line 24714 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24719,16 +24723,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24726: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24725: \$? = $ac_status" >&5
+  echo "$as_me:24729: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24731: \$? = $ac_status" >&5
+  echo "$as_me:24735: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24745,7 +24749,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}:24748: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24752: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24768,7 +24772,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24771 "configure"
+#line 24775 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24792,16 +24796,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24798: \$? = $ac_status" >&5
+  echo "$as_me:24802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24804: \$? = $ac_status" >&5
+  echo "$as_me:24808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -24822,12 +24826,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:24825: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24829: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:24830: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24834: 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%/[^/]*$%%'`
@@ -24863,7 +24867,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24866 "configure"
+#line 24870 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24875,16 +24879,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24882: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24881: \$? = $ac_status" >&5
+  echo "$as_me:24885: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24887: \$? = $ac_status" >&5
+  echo "$as_me:24891: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24901,7 +24905,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}:24904: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24908: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24949,7 +24953,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24952: checking for terminfo header" >&5
+echo "$as_me:24956: 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
@@ -24967,7 +24971,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24970 "configure"
+#line 24974 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24982,16 +24986,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24985: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24988: \$? = $ac_status" >&5
+  echo "$as_me:24992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24994: \$? = $ac_status" >&5
+  echo "$as_me:24998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -25007,7 +25011,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25010: result: $cf_cv_term_header" >&5
+echo "$as_me:25014: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -25045,7 +25049,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:25048: checking for ncurses version" >&5
+echo "$as_me:25052: 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
@@ -25071,10 +25075,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:25074: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:25078: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:25077: \$? = $ac_status" >&5
+  echo "$as_me:25081: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -25084,7 +25088,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25087 "configure"
+#line 25091 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25109,15 +25113,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25116: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25115: \$? = $ac_status" >&5
+  echo "$as_me:25119: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25120: \$? = $ac_status" >&5
+  echo "$as_me:25124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -25131,7 +25135,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:25134: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:25138: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -25144,7 +25148,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:25147: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:25151: 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
@@ -25152,7 +25156,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25155 "configure"
+#line 25159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25171,16 +25175,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25177: \$? = $ac_status" >&5
+  echo "$as_me:25181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25183: \$? = $ac_status" >&5
+  echo "$as_me:25187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -25191,10 +25195,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25194: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:25198: 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:25197: checking for initscr in -lgpm" >&5
+  echo "$as_me:25201: 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
@@ -25202,7 +25206,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25205 "configure"
+#line 25209 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25221,16 +25225,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25227: \$? = $ac_status" >&5
+  echo "$as_me:25231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25233: \$? = $ac_status" >&5
+  echo "$as_me:25237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -25241,7 +25245,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25244: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:25248: 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"
@@ -25256,7 +25260,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:25259: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:25263: 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
@@ -25264,7 +25268,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25267 "configure"
+#line 25271 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25283,16 +25287,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25289: \$? = $ac_status" >&5
+  echo "$as_me:25293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25295: \$? = $ac_status" >&5
+  echo "$as_me:25299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -25303,7 +25307,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25306: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:25310: 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"
@@ -25352,13 +25356,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:25355: checking for initscr" >&5
+	echo "$as_me:25359: 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 25361 "configure"
+#line 25365 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25389,16 +25393,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25395: \$? = $ac_status" >&5
+  echo "$as_me:25399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25401: \$? = $ac_status" >&5
+  echo "$as_me:25405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -25408,18 +25412,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25411: result: $ac_cv_func_initscr" >&5
+echo "$as_me:25415: 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:25418: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:25422: 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 25422 "configure"
+#line 25426 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25431,25 +25435,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25437: \$? = $ac_status" >&5
+  echo "$as_me:25441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25443: \$? = $ac_status" >&5
+  echo "$as_me:25447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25445: result: yes" >&5
+  echo "$as_me:25449: 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:25452: result: no" >&5
+echo "$as_me:25456: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25517,11 +25521,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25520: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:25524: 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 25524 "configure"
+#line 25528 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25533,25 +25537,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25540: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25539: \$? = $ac_status" >&5
+  echo "$as_me:25543: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25545: \$? = $ac_status" >&5
+  echo "$as_me:25549: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25547: result: yes" >&5
+  echo "$as_me:25551: 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:25554: result: no" >&5
+echo "$as_me:25558: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25566,7 +25570,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:25569: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:25573: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25574,7 +25578,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:25577: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:25581: 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
@@ -25584,7 +25588,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25587 "configure"
+#line 25591 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25596,23 +25600,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25602: \$? = $ac_status" >&5
+  echo "$as_me:25606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25608: \$? = $ac_status" >&5
+  echo "$as_me:25612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25610: result: yes" >&5
+  echo "$as_me:25614: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:25615: result: no" >&5
+echo "$as_me:25619: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -25638,13 +25642,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:25641: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:25645: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:25644: result: yes" >&5
+		echo "$as_me:25648: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:25647: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:25651: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -25777,7 +25781,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 25780 "configure"
+#line 25784 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25789,37 +25793,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25795: \$? = $ac_status" >&5
+  echo "$as_me:25799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25801: \$? = $ac_status" >&5
+  echo "$as_me:25805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25807 "configure"
+#line 25811 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 					int main(void)
 					{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25817: \$? = $ac_status" >&5
+  echo "$as_me:25821: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25822: \$? = $ac_status" >&5
+  echo "$as_me:25826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -25993,7 +25997,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25996 "configure"
+#line 26000 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26005,37 +26009,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26012: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26011: \$? = $ac_status" >&5
+  echo "$as_me:26015: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26017: \$? = $ac_status" >&5
+  echo "$as_me:26021: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26023 "configure"
+#line 26027 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ const char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26033: \$? = $ac_status" >&5
+  echo "$as_me:26037: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26038: \$? = $ac_status" >&5
+  echo "$as_me:26042: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -26052,7 +26056,7 @@ cat "conftest.$ac_ext" >&5
 cf_have_ncuconfig=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:26055: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:26059: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -26068,7 +26072,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:26071: checking for terminfo header" >&5
+echo "$as_me:26075: 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
@@ -26086,7 +26090,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26089 "configure"
+#line 26093 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -26101,16 +26105,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26107: \$? = $ac_status" >&5
+  echo "$as_me:26111: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26113: \$? = $ac_status" >&5
+  echo "$as_me:26117: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26126,7 +26130,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26129: result: $cf_cv_term_header" >&5
+echo "$as_me:26133: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -26161,7 +26165,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:26164: result: no" >&5
+		echo "$as_me:26168: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -26177,7 +26181,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:26180: checking for $ac_word" >&5
+echo "$as_me:26184: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26192,7 +26196,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:26195: found $ac_dir/$ac_word" >&5
+echo "$as_me:26199: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26200,10 +26204,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:26203: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:26207: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26206: result: no" >&5
+  echo "$as_me:26210: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26216,7 +26220,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:26219: checking for $ac_word" >&5
+echo "$as_me:26223: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26231,7 +26235,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_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:26234: found $ac_dir/$ac_word" >&5
+echo "$as_me:26238: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26239,10 +26243,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:26242: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:26246: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26245: result: no" >&5
+  echo "$as_me:26249: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26399,7 +26403,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:26402: checking if we have identified curses headers" >&5
+echo "$as_me:26406: 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
@@ -26411,28 +26415,28 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26414 "configure"
+#line 26418 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
 main (void)
 {
-initscr(); tgoto("?", 0,0)
+initscr(); endwin()
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26429: \$? = $ac_status" >&5
+  echo "$as_me:26433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26435: \$? = $ac_status" >&5
+  echo "$as_me:26439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -26443,11 +26447,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26446: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:26450: 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:26450: error: No curses header-files found" >&5
+	{ { echo "$as_me:26454: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26457,23 +26461,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:26460: checking for $ac_header" >&5
+echo "$as_me:26464: 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 26466 "configure"
+#line 26470 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26470: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26474: \"$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:26476: \$? = $ac_status" >&5
+  echo "$as_me:26480: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26492,7 +26496,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26495: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26499: 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
@@ -26548,7 +26552,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26551 "configure"
+#line 26555 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26560,16 +26564,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26566: \$? = $ac_status" >&5
+  echo "$as_me:26570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26572: \$? = $ac_status" >&5
+  echo "$as_me:26576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26586,7 +26590,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}:26589: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26593: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26605,7 +26609,7 @@ fi
 
 }
 
-echo "$as_me:26608: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:26612: 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
@@ -26617,7 +26621,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26620 "configure"
+#line 26624 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26641,16 +26645,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26647: \$? = $ac_status" >&5
+  echo "$as_me:26651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26653: \$? = $ac_status" >&5
+  echo "$as_me:26657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -26665,14 +26669,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:26668: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:26672: 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:26675: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:26679: 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
@@ -26793,7 +26797,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26796 "configure"
+#line 26800 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26805,16 +26809,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26808: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26811: \$? = $ac_status" >&5
+  echo "$as_me:26815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26817: \$? = $ac_status" >&5
+  echo "$as_me:26821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26831,7 +26835,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}:26834: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26838: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26854,7 +26858,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26857 "configure"
+#line 26861 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26878,16 +26882,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26885: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26884: \$? = $ac_status" >&5
+  echo "$as_me:26888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26890: \$? = $ac_status" >&5
+  echo "$as_me:26894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -26908,12 +26912,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:26911: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26915: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:26916: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:26920: 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%/[^/]*$%%'`
@@ -26949,7 +26953,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26952 "configure"
+#line 26956 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26961,16 +26965,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26968: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26967: \$? = $ac_status" >&5
+  echo "$as_me:26971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26973: \$? = $ac_status" >&5
+  echo "$as_me:26977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26987,7 +26991,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}:26990: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26994: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27035,7 +27039,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:27038: checking for terminfo header" >&5
+echo "$as_me:27042: 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
@@ -27053,7 +27057,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27056 "configure"
+#line 27060 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -27068,16 +27072,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27074: \$? = $ac_status" >&5
+  echo "$as_me:27078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27080: \$? = $ac_status" >&5
+  echo "$as_me:27084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -27093,7 +27097,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:27096: result: $cf_cv_term_header" >&5
+echo "$as_me:27100: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -27131,7 +27135,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:27134: checking for ncurses version" >&5
+echo "$as_me:27138: 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
@@ -27157,10 +27161,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:27160: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:27164: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:27163: \$? = $ac_status" >&5
+  echo "$as_me:27167: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -27170,7 +27174,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27173 "configure"
+#line 27177 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -27195,15 +27199,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27201: \$? = $ac_status" >&5
+  echo "$as_me:27205: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27206: \$? = $ac_status" >&5
+  echo "$as_me:27210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -27217,7 +27221,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:27220: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:27224: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -27230,7 +27234,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:27233: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:27237: 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
@@ -27238,7 +27242,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27241 "configure"
+#line 27245 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27257,16 +27261,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27263: \$? = $ac_status" >&5
+  echo "$as_me:27267: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27269: \$? = $ac_status" >&5
+  echo "$as_me:27273: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -27277,10 +27281,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27280: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:27284: 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:27283: checking for initscr in -lgpm" >&5
+  echo "$as_me:27287: 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
@@ -27288,7 +27292,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27291 "configure"
+#line 27295 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27307,16 +27311,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27310: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27313: \$? = $ac_status" >&5
+  echo "$as_me:27317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27319: \$? = $ac_status" >&5
+  echo "$as_me:27323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -27327,7 +27331,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27330: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:27334: 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"
@@ -27342,7 +27346,7 @@ case "$host_os" in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it is static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:27345: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:27349: 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
@@ -27350,7 +27354,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27353 "configure"
+#line 27357 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27369,16 +27373,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27375: \$? = $ac_status" >&5
+  echo "$as_me:27379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27381: \$? = $ac_status" >&5
+  echo "$as_me:27385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -27389,7 +27393,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27392: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:27396: 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"
@@ -27438,13 +27442,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:27441: checking for initscr" >&5
+	echo "$as_me:27445: 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 27447 "configure"
+#line 27451 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27475,16 +27479,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27481: \$? = $ac_status" >&5
+  echo "$as_me:27485: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27487: \$? = $ac_status" >&5
+  echo "$as_me:27491: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -27494,18 +27498,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27497: result: $ac_cv_func_initscr" >&5
+echo "$as_me:27501: 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:27504: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:27508: 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 27508 "configure"
+#line 27512 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27517,25 +27521,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27524: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27523: \$? = $ac_status" >&5
+  echo "$as_me:27527: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27529: \$? = $ac_status" >&5
+  echo "$as_me:27533: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27531: result: yes" >&5
+  echo "$as_me:27535: 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:27538: result: no" >&5
+echo "$as_me:27542: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -27603,11 +27607,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:27606: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:27610: 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 27610 "configure"
+#line 27614 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27619,25 +27623,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27625: \$? = $ac_status" >&5
+  echo "$as_me:27629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27631: \$? = $ac_status" >&5
+  echo "$as_me:27635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27633: result: yes" >&5
+  echo "$as_me:27637: 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:27640: result: no" >&5
+echo "$as_me:27644: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -27652,7 +27656,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:27655: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:27659: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27660,7 +27664,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:27663: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:27667: 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
@@ -27670,7 +27674,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27673 "configure"
+#line 27677 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27682,23 +27686,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27688: \$? = $ac_status" >&5
+  echo "$as_me:27692: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27694: \$? = $ac_status" >&5
+  echo "$as_me:27698: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27696: result: yes" >&5
+  echo "$as_me:27700: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:27701: result: no" >&5
+echo "$as_me:27705: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -27730,7 +27734,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:27733: checking for slang header file" >&5
+echo "$as_me:27737: 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
@@ -27738,7 +27742,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27741 "configure"
+#line 27745 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27750,16 +27754,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27753: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27756: \$? = $ac_status" >&5
+  echo "$as_me:27760: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27762: \$? = $ac_status" >&5
+  echo "$as_me:27766: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -27864,7 +27868,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27867: result: $cf_cv_slang_header" >&5
+echo "$as_me:27871: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -27908,7 +27912,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 27911 "configure"
+#line 27915 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27920,16 +27924,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27926: \$? = $ac_status" >&5
+  echo "$as_me:27930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27932: \$? = $ac_status" >&5
+  echo "$as_me:27936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -27946,7 +27950,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}:27949: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27953: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27978,52 +27982,52 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27981 "configure"
+#line 27985 "configure"
 #include "confdefs.h"
-
+extern char *tgoto(const char*,int,int);
 int
 main (void)
 {
-char *x=(char*)tgoto("",0,0)
+char *x=tgoto("",0,0)
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27996: \$? = $ac_status" >&5
+  echo "$as_me:28000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28002: \$? = $ac_status" >&5
+  echo "$as_me:28006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28005 "configure"
+#line 28009 "configure"
 #include "confdefs.h"
-
+extern char *tigetstr(const char *)
 int
 main (void)
 {
-int x=tigetstr("")
+char *x=tigetstr("")
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28021: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28020: \$? = $ac_status" >&5
+  echo "$as_me:28024: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28026: \$? = $ac_status" >&5
+  echo "$as_me:28030: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -28034,7 +28038,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}:28037: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:28041: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -28049,10 +28053,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:28052: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:28056: 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 28055 "configure"
+#line 28059 "configure"
 #include "confdefs.h"
 
 int
@@ -28064,16 +28068,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28070: \$? = $ac_status" >&5
+  echo "$as_me:28074: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28076: \$? = $ac_status" >&5
+  echo "$as_me:28080: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28082,7 +28086,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:28085: result: $cf_result" >&5
+			echo "$as_me:28089: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -28099,7 +28103,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:28102: checking for initscr in -lcurses" >&5
+	echo "$as_me:28106: 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
@@ -28107,7 +28111,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28110 "configure"
+#line 28114 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28126,16 +28130,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28132: \$? = $ac_status" >&5
+  echo "$as_me:28136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28138: \$? = $ac_status" >&5
+  echo "$as_me:28142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -28146,7 +28150,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28149: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:28153: 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
 
@@ -28168,7 +28172,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:28171: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:28175: 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
@@ -28176,7 +28180,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28179 "configure"
+#line 28183 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28195,16 +28199,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28201: \$? = $ac_status" >&5
+  echo "$as_me:28205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28207: \$? = $ac_status" >&5
+  echo "$as_me:28211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -28215,7 +28219,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28218: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:28222: 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
 
@@ -28242,20 +28246,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:28245: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:28249: 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:28252: checking for acos" >&5
+echo "$as_me:28256: 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 28258 "configure"
+#line 28262 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28286,16 +28290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28292: \$? = $ac_status" >&5
+  echo "$as_me:28296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28298: \$? = $ac_status" >&5
+  echo "$as_me:28302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -28305,13 +28309,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28308: result: $ac_cv_func_acos" >&5
+echo "$as_me:28312: 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:28314: checking for acos in -lm" >&5
+echo "$as_me:28318: 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
@@ -28319,7 +28323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28322 "configure"
+#line 28326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28338,16 +28342,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28344: \$? = $ac_status" >&5
+  echo "$as_me:28348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28350: \$? = $ac_status" >&5
+  echo "$as_me:28354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -28358,7 +28362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28361: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:28365: 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
 
@@ -28384,13 +28388,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:28387: checking for v_init" >&5
+	echo "$as_me:28391: 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 28393 "configure"
+#line 28397 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28421,16 +28425,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28427: \$? = $ac_status" >&5
+  echo "$as_me:28431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28433: \$? = $ac_status" >&5
+  echo "$as_me:28437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -28440,18 +28444,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28443: result: $ac_cv_func_v_init" >&5
+echo "$as_me:28447: 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:28450: checking for v_init in -lvideo" >&5
+		echo "$as_me:28454: 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 28454 "configure"
+#line 28458 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28463,25 +28467,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28469: \$? = $ac_status" >&5
+  echo "$as_me:28473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28475: \$? = $ac_status" >&5
+  echo "$as_me:28479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28477: result: yes" >&5
+  echo "$as_me:28481: 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:28484: result: no" >&5
+echo "$as_me:28488: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28549,11 +28553,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28552: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:28556: 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 28556 "configure"
+#line 28560 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28565,25 +28569,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28571: \$? = $ac_status" >&5
+  echo "$as_me:28575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28577: \$? = $ac_status" >&5
+  echo "$as_me:28581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28579: result: yes" >&5
+  echo "$as_me:28583: 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:28586: result: no" >&5
+echo "$as_me:28590: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28598,7 +28602,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28601: error: Cannot link video library" >&5
+	{ { echo "$as_me:28605: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -28608,13 +28612,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang"'=no'
 	cf_libdir=""
-	echo "$as_me:28611: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:28615: 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 28617 "configure"
+#line 28621 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28645,16 +28649,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28651: \$? = $ac_status" >&5
+  echo "$as_me:28655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28657: \$? = $ac_status" >&5
+  echo "$as_me:28661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -28664,18 +28668,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:28667: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:28671: 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:28674: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:28678: 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 28678 "configure"
+#line 28682 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28687,25 +28691,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28693: \$? = $ac_status" >&5
+  echo "$as_me:28697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28699: \$? = $ac_status" >&5
+  echo "$as_me:28703: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28701: result: yes" >&5
+  echo "$as_me:28705: 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:28708: result: no" >&5
+echo "$as_me:28712: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28773,11 +28777,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28776: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:28780: 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 28780 "configure"
+#line 28784 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28789,25 +28793,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28795: \$? = $ac_status" >&5
+  echo "$as_me:28799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28801: \$? = $ac_status" >&5
+  echo "$as_me:28805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28803: result: yes" >&5
+  echo "$as_me:28807: 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:28810: result: no" >&5
+echo "$as_me:28814: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28822,13 +28826,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28825: error: Cannot link slang library" >&5
+	{ { echo "$as_me:28829: 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:28831: checking if we can link slang without termcap" >&5
+echo "$as_me:28835: 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%^.%%'`
@@ -28837,7 +28841,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28840 "configure"
+#line 28844 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28849,16 +28853,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28855: \$? = $ac_status" >&5
+  echo "$as_me:28859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28861: \$? = $ac_status" >&5
+  echo "$as_me:28865: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28867,13 +28871,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:28870: result: $cf_result" >&5
+echo "$as_me:28874: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:28876: checking for slang2 header file" >&5
+echo "$as_me:28880: 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
@@ -28881,7 +28885,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28884 "configure"
+#line 28888 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28893,16 +28897,16 @@ printf("%s\\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28899: \$? = $ac_status" >&5
+  echo "$as_me:28903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28905: \$? = $ac_status" >&5
+  echo "$as_me:28909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -29007,7 +29011,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29010: result: $cf_cv_slang2_header" >&5
+echo "$as_me:29014: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -29051,7 +29055,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 29054 "configure"
+#line 29058 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29063,16 +29067,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29069: \$? = $ac_status" >&5
+  echo "$as_me:29073: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29075: \$? = $ac_status" >&5
+  echo "$as_me:29079: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -29089,7 +29093,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}:29092: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:29096: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29121,52 +29125,52 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29124 "configure"
+#line 29128 "configure"
 #include "confdefs.h"
-
+extern char *tgoto(const char*,int,int);
 int
 main (void)
 {
-char *x=(char*)tgoto("",0,0)
+char *x=tgoto("",0,0)
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29139: \$? = $ac_status" >&5
+  echo "$as_me:29143: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29145: \$? = $ac_status" >&5
+  echo "$as_me:29149: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29148 "configure"
+#line 29152 "configure"
 #include "confdefs.h"
-
+extern char *tigetstr(const char *)
 int
 main (void)
 {
-int x=tigetstr("")
+char *x=tigetstr("")
   ;
   return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29163: \$? = $ac_status" >&5
+  echo "$as_me:29167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29169: \$? = $ac_status" >&5
+  echo "$as_me:29173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -29177,7 +29181,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}:29180: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:29184: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29192,10 +29196,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:29195: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:29199: 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 29198 "configure"
+#line 29202 "configure"
 #include "confdefs.h"
 
 int
@@ -29207,16 +29211,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29213: \$? = $ac_status" >&5
+  echo "$as_me:29217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29219: \$? = $ac_status" >&5
+  echo "$as_me:29223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29225,7 +29229,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:29228: result: $cf_result" >&5
+			echo "$as_me:29232: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -29242,7 +29246,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:29245: checking for initscr in -lcurses" >&5
+	echo "$as_me:29249: 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
@@ -29250,7 +29254,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29253 "configure"
+#line 29257 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29269,16 +29273,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29276: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29275: \$? = $ac_status" >&5
+  echo "$as_me:29279: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29282: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29281: \$? = $ac_status" >&5
+  echo "$as_me:29285: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -29289,7 +29293,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29292: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:29296: 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
 
@@ -29311,7 +29315,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:29314: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:29318: 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
@@ -29319,7 +29323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29322 "configure"
+#line 29326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29338,16 +29342,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29344: \$? = $ac_status" >&5
+  echo "$as_me:29348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29350: \$? = $ac_status" >&5
+  echo "$as_me:29354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -29358,7 +29362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29361: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:29365: 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
 
@@ -29385,20 +29389,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:29388: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:29392: 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:29395: checking for acos" >&5
+echo "$as_me:29399: 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 29401 "configure"
+#line 29405 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29429,16 +29433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29435: \$? = $ac_status" >&5
+  echo "$as_me:29439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29441: \$? = $ac_status" >&5
+  echo "$as_me:29445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -29448,13 +29452,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29451: result: $ac_cv_func_acos" >&5
+echo "$as_me:29455: 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:29457: checking for acos in -lm" >&5
+echo "$as_me:29461: 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
@@ -29462,7 +29466,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29465 "configure"
+#line 29469 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29481,16 +29485,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29488: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29487: \$? = $ac_status" >&5
+  echo "$as_me:29491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29493: \$? = $ac_status" >&5
+  echo "$as_me:29497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -29501,7 +29505,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29504: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:29508: 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
 
@@ -29527,13 +29531,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:29530: checking for v_init" >&5
+	echo "$as_me:29534: 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 29536 "configure"
+#line 29540 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29564,16 +29568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29570: \$? = $ac_status" >&5
+  echo "$as_me:29574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29576: \$? = $ac_status" >&5
+  echo "$as_me:29580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -29583,18 +29587,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29586: result: $ac_cv_func_v_init" >&5
+echo "$as_me:29590: 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:29593: checking for v_init in -lvideo" >&5
+		echo "$as_me:29597: 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 29597 "configure"
+#line 29601 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29606,25 +29610,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29612: \$? = $ac_status" >&5
+  echo "$as_me:29616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29618: \$? = $ac_status" >&5
+  echo "$as_me:29622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29620: result: yes" >&5
+  echo "$as_me:29624: 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:29627: result: no" >&5
+echo "$as_me:29631: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29692,11 +29696,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29695: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:29699: 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 29699 "configure"
+#line 29703 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29708,25 +29712,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29714: \$? = $ac_status" >&5
+  echo "$as_me:29718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29720: \$? = $ac_status" >&5
+  echo "$as_me:29724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29722: result: yes" >&5
+  echo "$as_me:29726: 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:29729: result: no" >&5
+echo "$as_me:29733: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29741,7 +29745,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29744: error: Cannot link video library" >&5
+	{ { echo "$as_me:29748: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -29751,13 +29755,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang2"'=no'
 	cf_libdir=""
-	echo "$as_me:29754: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:29758: 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 29760 "configure"
+#line 29764 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29788,16 +29792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29794: \$? = $ac_status" >&5
+  echo "$as_me:29798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29800: \$? = $ac_status" >&5
+  echo "$as_me:29804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -29807,18 +29811,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:29810: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:29814: 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:29817: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:29821: 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 29821 "configure"
+#line 29825 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29830,25 +29834,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29836: \$? = $ac_status" >&5
+  echo "$as_me:29840: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29842: \$? = $ac_status" >&5
+  echo "$as_me:29846: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29844: result: yes" >&5
+  echo "$as_me:29848: 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:29851: result: no" >&5
+echo "$as_me:29855: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29916,11 +29920,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29919: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:29923: 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 29923 "configure"
+#line 29927 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29932,25 +29936,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29938: \$? = $ac_status" >&5
+  echo "$as_me:29942: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29944: \$? = $ac_status" >&5
+  echo "$as_me:29948: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29946: result: yes" >&5
+  echo "$as_me:29950: 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:29953: result: no" >&5
+echo "$as_me:29957: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29965,13 +29969,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29968: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:29972: 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:29974: checking if we can link slang2 without termcap" >&5
+echo "$as_me:29978: 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%^.%%'`
@@ -29980,7 +29984,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29983 "configure"
+#line 29987 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29992,16 +29996,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29998: \$? = $ac_status" >&5
+  echo "$as_me:30002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30004: \$? = $ac_status" >&5
+  echo "$as_me:30008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -30010,12 +30014,12 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:30013: result: $cf_result" >&5
+echo "$as_me:30017: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:30018: error: cannot find slang headers" >&5
+		{ { echo "$as_me:30022: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30023,14 +30027,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:30026: checking if we must define UTF8" >&5
+echo "$as_me:30030: 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 30033 "configure"
+#line 30037 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30042,16 +30046,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30045: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30048: \$? = $ac_status" >&5
+  echo "$as_me:30052: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30054: \$? = $ac_status" >&5
+  echo "$as_me:30058: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -30059,7 +30063,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 30062 "configure"
+#line 30066 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -30073,16 +30077,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30079: \$? = $ac_status" >&5
+  echo "$as_me:30083: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30085: \$? = $ac_status" >&5
+  echo "$as_me:30089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -30095,7 +30099,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30098: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:30102: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -30106,14 +30110,14 @@ EOF
 
 fi
 
-echo "$as_me:30109: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:30113: 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 30116 "configure"
+#line 30120 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30132,16 +30136,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30138: \$? = $ac_status" >&5
+  echo "$as_me:30142: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30144: \$? = $ac_status" >&5
+  echo "$as_me:30148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -30152,20 +30156,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30155: result: $cf_cv_slang_unix" >&5
+echo "$as_me:30159: 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
 EOF
 
-	echo "$as_me:30162: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:30166: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30168 "configure"
+#line 30172 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30181,16 +30185,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30187: \$? = $ac_status" >&5
+  echo "$as_me:30191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30193: \$? = $ac_status" >&5
+  echo "$as_me:30197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -30200,7 +30204,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30203: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:30207: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test "$ac_cv_type_SLsmg_Color_Type" = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -30216,13 +30220,13 @@ EOF
 
 fi
 
-	echo "$as_me:30219: checking for SLtt_Char_Type" >&5
+	echo "$as_me:30223: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30225 "configure"
+#line 30229 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30238,16 +30242,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30244: \$? = $ac_status" >&5
+  echo "$as_me:30248: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30250: \$? = $ac_status" >&5
+  echo "$as_me:30254: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -30257,7 +30261,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30260: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:30264: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test "$ac_cv_type_SLtt_Char_Type" = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -30280,7 +30284,7 @@ esac
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:30283: checking for an rpath option" >&5
+	echo "$as_me:30287: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -30311,12 +30315,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:30314: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:30318: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:30319: checking if we need a space after rpath option" >&5
+		echo "$as_me:30323: 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"
 
@@ -30337,7 +30341,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 30340 "configure"
+#line 30344 "configure"
 #include "confdefs.h"
 
 int
@@ -30349,16 +30353,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30355: \$? = $ac_status" >&5
+  echo "$as_me:30359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30361: \$? = $ac_status" >&5
+  echo "$as_me:30365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -30368,7 +30372,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:30371: result: $cf_rpath_space" >&5
+		echo "$as_me:30375: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -30379,13 +30383,13 @@ if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30382: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30386: testing will not attempt to use rpath ..." 1>&5
 
 elif test "x${enable_rpath_hack:-yes}" = "xno"
 then
 	test -n "$verbose" && echo "	rpath is disabled" 1>&6
 
-echo "${as_me:-configure}:30388: testing rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:30392: testing rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -30396,7 +30400,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30399 "configure"
+#line 30403 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30405,15 +30409,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30408: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30411: \$? = $ac_status" >&5
+  echo "$as_me:30415: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30416: \$? = $ac_status" >&5
+  echo "$as_me:30420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30429,7 +30433,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:30432: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:30436: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -30461,7 +30465,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30464 "configure"
+#line 30468 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main(void) {
@@ -30470,15 +30474,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30476: \$? = $ac_status" >&5
+  echo "$as_me:30480: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30481: \$? = $ac_status" >&5
+  echo "$as_me:30485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30494,12 +30498,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:30497: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:30501: testing use rpath for $cf_save_LIBS ..." 1>&5
 
 					LIBS="$cf_result"
 					test -n "$verbose" && echo "	result is now $LIBS" 1>&6
 
-echo "${as_me:-configure}:30502: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:30506: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -30510,20 +30514,20 @@ echo "${as_me:-configure}:30502: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30513: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30517: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:30519: checking for chtype typedef" >&5
+echo "$as_me:30523: 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 30526 "configure"
+#line 30530 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30535,16 +30539,16 @@ chtype foo; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30541: \$? = $ac_status" >&5
+  echo "$as_me:30545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30547: \$? = $ac_status" >&5
+  echo "$as_me:30551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -30554,7 +30558,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30557: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:30561: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test "$cf_cv_chtype_decl" = yes ; then
 
@@ -30562,14 +30566,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:30565: checking if chtype is scalar or struct" >&5
+	echo "$as_me:30569: 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 30572 "configure"
+#line 30576 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30581,16 +30585,16 @@ static chtype foo; long x = foo; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30587: \$? = $ac_status" >&5
+  echo "$as_me:30591: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30593: \$? = $ac_status" >&5
+  echo "$as_me:30597: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -30600,7 +30604,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30603: result: $cf_cv_chtype_type" >&5
+echo "$as_me:30607: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test "$cf_cv_chtype_type" = scalar ; then
 
@@ -30611,7 +30615,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:30614: checking if you want the wide-curses features" >&5
+echo "$as_me:30618: 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.
@@ -30628,10 +30632,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:30631: result: $use_wide_curses" >&5
+echo "$as_me:30635: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:30634: checking if color-style code should be used" >&5
+echo "$as_me:30638: 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.
@@ -30651,7 +30655,7 @@ fi;
 
 case "$use_color_style" in
 (no)
-	echo "$as_me:30654: result: no" >&5
+	echo "$as_me:30658: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -30661,10 +30665,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:30664: result: yes" >&5
+	echo "$as_me:30668: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:30667: checking for location of style-sheet file" >&5
+	echo "$as_me:30671: 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.
@@ -30700,7 +30704,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30703: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30707: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30709,7 +30713,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:30712: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:30716: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -30722,7 +30726,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:30725: checking for the default configuration-file" >&5
+echo "$as_me:30729: 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.
@@ -30758,7 +30762,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30761: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30765: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30767,7 +30771,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:30770: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:30774: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -30776,7 +30780,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:30779: checking for the default configuration-path" >&5
+echo "$as_me:30783: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -30812,7 +30816,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30815: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30819: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30821,7 +30825,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:30824: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:30828: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && LYNX_CFG_PATH="`echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`"
@@ -30831,7 +30835,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:30834: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:30838: 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.
@@ -30848,7 +30852,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:30851: result: $use_htmlized_cfg" >&5
+echo "$as_me:30855: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -30859,7 +30863,7 @@ else
 	LYNXCFG_NO_MAKE='#'
 fi
 
-echo "$as_me:30862: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:30866: 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.
@@ -30876,7 +30880,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:30879: result: $use_local_docs" >&5
+echo "$as_me:30883: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -30884,7 +30888,7 @@ if test "$use_local_docs" = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:30887: checking for MIME library directory" >&5
+echo "$as_me:30891: 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.
@@ -30920,7 +30924,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30923: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30927: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30929,7 +30933,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:30932: result: $MIME_LIBDIR" >&5
+echo "$as_me:30936: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -30937,7 +30941,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:30940: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:30944: 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.
@@ -30954,7 +30958,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:30957: result: $use_locale_charset" >&5
+echo "$as_me:30961: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test "$use_locale_charset" != no &&
 cat >>confdefs.h <<\EOF
@@ -30963,7 +30967,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:30966: checking if you want only a few charsets" >&5
+echo "$as_me:30970: 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.
@@ -30975,7 +30979,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:30978: result: yes" >&5
+	echo "$as_me:30982: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -30989,7 +30993,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}:30992: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:30996: 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'`
@@ -31016,28 +31020,28 @@ echo "${as_me:-configure}:30992: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:31019: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31023: 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}:31025: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31029: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:31030: result: no" >&5
+	echo "$as_me:31034: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31034: checking for ANSI C header files" >&5
+echo "$as_me:31038: 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 31040 "configure"
+#line 31044 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -31045,13 +31049,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:31048: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31052: \"$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:31054: \$? = $ac_status" >&5
+  echo "$as_me:31058: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31073,7 +31077,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 31076 "configure"
+#line 31080 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -31091,7 +31095,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 31094 "configure"
+#line 31098 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -31112,7 +31116,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31115 "configure"
+#line 31119 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -31138,15 +31142,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31144: \$? = $ac_status" >&5
+  echo "$as_me:31148: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31150: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31149: \$? = $ac_status" >&5
+  echo "$as_me:31153: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -31159,7 +31163,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:31162: result: $ac_cv_header_stdc" >&5
+echo "$as_me:31166: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -31169,13 +31173,13 @@ EOF
 
 fi
 
-echo "$as_me:31172: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:31176: 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 31178 "configure"
+#line 31182 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -31191,16 +31195,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31198: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31197: \$? = $ac_status" >&5
+  echo "$as_me:31201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31203: \$? = $ac_status" >&5
+  echo "$as_me:31207: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -31210,7 +31214,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31213: result: $ac_cv_header_time" >&5
+echo "$as_me:31217: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -31223,13 +31227,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:31226: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:31230: 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 31232 "configure"
+#line 31236 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -31244,16 +31248,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31250: \$? = $ac_status" >&5
+  echo "$as_me:31254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31256: \$? = $ac_status" >&5
+  echo "$as_me:31260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -31263,7 +31267,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31266: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31270: 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
@@ -31276,7 +31280,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:31279: checking for opendir in -ldir" >&5
+  echo "$as_me:31283: 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
@@ -31284,7 +31288,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31287 "configure"
+#line 31291 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31303,16 +31307,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31309: \$? = $ac_status" >&5
+  echo "$as_me:31313: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31315: \$? = $ac_status" >&5
+  echo "$as_me:31319: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -31323,14 +31327,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31326: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:31330: 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:31333: checking for opendir in -lx" >&5
+  echo "$as_me:31337: 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
@@ -31338,7 +31342,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31341 "configure"
+#line 31345 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31357,16 +31361,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31363: \$? = $ac_status" >&5
+  echo "$as_me:31367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31369: \$? = $ac_status" >&5
+  echo "$as_me:31373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -31377,7 +31381,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31380: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:31384: 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"
@@ -31406,23 +31410,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31409: checking for $ac_header" >&5
+echo "$as_me:31413: 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 31415 "configure"
+#line 31419 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31419: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31423: \"$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:31425: \$? = $ac_status" >&5
+  echo "$as_me:31429: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31441,7 +31445,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31444: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31448: 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
@@ -31451,16 +31455,17 @@ EOF
 fi
 done
 
-echo "$as_me:31454: checking termio.h and termios.h" >&5
+echo "$as_me:31458: 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 31461 "configure"
+#line 31465 "configure"
 #include "confdefs.h"
 
+#include <stdio.h>
 #if HAVE_TERMIO_H
 #include <termio.h>
 #endif
@@ -31476,16 +31481,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31482: \$? = $ac_status" >&5
+  echo "$as_me:31487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31488: \$? = $ac_status" >&5
+  echo "$as_me:31493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -31496,21 +31501,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31499: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:31504: 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:31506: checking for sigaction and structs" >&5
+echo "$as_me:31511: 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 31513 "configure"
+#line 31518 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31521,7 +31526,7 @@ main (void)
 struct sigaction act;
 	act.sa_handler = SIG_DFL;
 #ifdef SA_RESTART
-	act.sa_flags |= SA_RESTART;
+	act.sa_flags = SA_RESTART;
 #endif /* SA_RESTART */
 	sigaction(1, &act, 0);
 
@@ -31530,16 +31535,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31533: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31536: \$? = $ac_status" >&5
+  echo "$as_me:31541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31542: \$? = $ac_status" >&5
+  echo "$as_me:31547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -31550,7 +31555,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:31553: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:31558: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31560,23 +31565,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:31563: checking for $ac_header" >&5
+echo "$as_me:31568: 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 31569 "configure"
+#line 31574 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31573: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31578: \"$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:31579: \$? = $ac_status" >&5
+  echo "$as_me:31584: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31595,7 +31600,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31598: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31603: 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
@@ -31616,23 +31621,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31619: checking for $ac_header" >&5
+echo "$as_me:31624: 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 31625 "configure"
+#line 31630 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31629: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31634: \"$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:31635: \$? = $ac_status" >&5
+  echo "$as_me:31640: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31651,7 +31656,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31654: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31659: 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
@@ -31664,23 +31669,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31667: checking for $ac_header" >&5
+echo "$as_me:31672: 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 31673 "configure"
+#line 31678 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31677: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31682: \"$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:31683: \$? = $ac_status" >&5
+  echo "$as_me:31688: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31699,7 +31704,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31702: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31707: 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
@@ -31721,14 +31726,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:31724: checking for union wait" >&5
+echo "$as_me:31729: 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 31731 "configure"
+#line 31736 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31747,16 +31752,16 @@ static int x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31753: \$? = $ac_status" >&5
+  echo "$as_me:31758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31759: \$? = $ac_status" >&5
+  echo "$as_me:31764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -31766,7 +31771,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 31769 "configure"
+#line 31774 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31793,16 +31798,16 @@ union wait x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31799: \$? = $ac_status" >&5
+  echo "$as_me:31804: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31805: \$? = $ac_status" >&5
+  echo "$as_me:31810: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -31817,7 +31822,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31820: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:31825: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test "$cf_cv_type_unionwait" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31826,14 +31831,14 @@ EOF
 
 if test "$cf_cv_type_unionwait" = yes; then
 
-	echo "$as_me:31829: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:31834: 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 31836 "configure"
+#line 31841 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31845,16 +31850,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31853: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31851: \$? = $ac_status" >&5
+  echo "$as_me:31856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31857: \$? = $ac_status" >&5
+  echo "$as_me:31862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -31866,21 +31871,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31869: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:31874: 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:31876: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:31881: 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 31883 "configure"
+#line 31888 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31892,16 +31897,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31898: \$? = $ac_status" >&5
+  echo "$as_me:31903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31904: \$? = $ac_status" >&5
+  echo "$as_me:31909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -31913,7 +31918,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31916: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:31921: 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
@@ -31922,13 +31927,13 @@ EOF
 
 fi
 
-echo "$as_me:31925: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31930: 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 31931 "configure"
+#line 31936 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31942,7 +31947,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31945: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31950: 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
 
@@ -31956,7 +31961,7 @@ EOF
 
 fi
 
-echo "$as_me:31959: checking type of array argument to getgroups" >&5
+echo "$as_me:31964: 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
@@ -31965,8 +31970,9 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31968 "configure"
+#line 31973 "configure"
 #include "confdefs.h"
+$ac_includes_default
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
 #define NGID 256
@@ -31991,15 +31997,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31997: \$? = $ac_status" >&5
+  echo "$as_me:32003: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32002: \$? = $ac_status" >&5
+  echo "$as_me:32008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -32012,7 +32018,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >"conftest.$ac_ext" <<_ACEOF
-#line 32015 "configure"
+#line 32021 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -32027,20 +32033,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:32030: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:32036: 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:32037: checking for off_t" >&5
+echo "$as_me:32043: 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 32043 "configure"
+#line 32049 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32055,16 +32061,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32058: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32064: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32061: \$? = $ac_status" >&5
+  echo "$as_me:32067: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32067: \$? = $ac_status" >&5
+  echo "$as_me:32073: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32074,7 +32080,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32077: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32083: 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
   :
@@ -32086,13 +32092,13 @@ EOF
 
 fi
 
-echo "$as_me:32089: checking for pid_t" >&5
+echo "$as_me:32095: 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 32095 "configure"
+#line 32101 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32107,16 +32113,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32116: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32113: \$? = $ac_status" >&5
+  echo "$as_me:32119: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32122: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32119: \$? = $ac_status" >&5
+  echo "$as_me:32125: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -32126,7 +32132,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32129: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:32135: 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
   :
@@ -32138,13 +32144,13 @@ EOF
 
 fi
 
-echo "$as_me:32141: checking for uid_t in sys/types.h" >&5
+echo "$as_me:32147: 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 32147 "configure"
+#line 32153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -32158,7 +32164,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:32161: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:32167: 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
 
@@ -32172,13 +32178,13 @@ EOF
 
 fi
 
-echo "$as_me:32175: checking for mode_t" >&5
+echo "$as_me:32181: 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 32181 "configure"
+#line 32187 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32193,16 +32199,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32199: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32205: \$? = $ac_status" >&5
+  echo "$as_me:32211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -32212,7 +32218,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32215: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:32221: 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
   :
@@ -32224,13 +32230,13 @@ EOF
 
 fi
 
-	echo "$as_me:32227: checking for ssize_t" >&5
+	echo "$as_me:32233: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 32233 "configure"
+#line 32239 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32245,16 +32251,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32254: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32251: \$? = $ac_status" >&5
+  echo "$as_me:32257: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32257: \$? = $ac_status" >&5
+  echo "$as_me:32263: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -32264,7 +32270,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32267: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:32273: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test "$ac_cv_type_ssize_t" = yes; then
   ac_cv_type_ssize_t=yes
@@ -32280,13 +32286,13 @@ EOF
 
 fi
 
-	echo "$as_me:32283: checking for socklen_t" >&5
+	echo "$as_me:32289: 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 32289 "configure"
+#line 32295 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32304,16 +32310,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32313: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32310: \$? = $ac_status" >&5
+  echo "$as_me:32316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32316: \$? = $ac_status" >&5
+  echo "$as_me:32322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -32323,7 +32329,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32326: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:32332: 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
@@ -32339,7 +32345,7 @@ EOF
 
 fi
 
-echo "$as_me:32342: checking for long long type" >&5
+echo "$as_me:32348: 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
@@ -32370,7 +32376,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:32373: result: $cf_cv_type_long_long" >&5
+echo "$as_me:32379: 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
@@ -32381,14 +32387,14 @@ EOF
 
 fi
 
-echo "$as_me:32384: checking for tm.tm_gmtoff" >&5
+echo "$as_me:32390: 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 32391 "configure"
+#line 32397 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -32413,16 +32419,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32416: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32422: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32419: \$? = $ac_status" >&5
+  echo "$as_me:32425: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32425: \$? = $ac_status" >&5
+  echo "$as_me:32431: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -32433,20 +32439,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:32436: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:32442: 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:32443: checking for int" >&5
+echo "$as_me:32449: 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 32449 "configure"
+#line 32455 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32461,16 +32467,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32470: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32467: \$? = $ac_status" >&5
+  echo "$as_me:32473: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32473: \$? = $ac_status" >&5
+  echo "$as_me:32479: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_int=yes
 else
@@ -32480,10 +32486,10 @@ ac_cv_type_int=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32483: result: $ac_cv_type_int" >&5
+echo "$as_me:32489: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:32486: checking size of int" >&5
+echo "$as_me:32492: 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
@@ -32492,7 +32498,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32495 "configure"
+#line 32501 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32504,21 +32510,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32510: \$? = $ac_status" >&5
+  echo "$as_me:32516: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32516: \$? = $ac_status" >&5
+  echo "$as_me:32522: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32521 "configure"
+#line 32527 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32530,16 +32536,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32536: \$? = $ac_status" >&5
+  echo "$as_me:32542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32542: \$? = $ac_status" >&5
+  echo "$as_me:32548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32555,7 +32561,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32558 "configure"
+#line 32564 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32567,16 +32573,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32573: \$? = $ac_status" >&5
+  echo "$as_me:32579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32579: \$? = $ac_status" >&5
+  echo "$as_me:32585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32592,7 +32598,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 32595 "configure"
+#line 32601 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32604,16 +32610,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32613: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32610: \$? = $ac_status" >&5
+  echo "$as_me:32616: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32616: \$? = $ac_status" >&5
+  echo "$as_me:32622: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32626,12 +32632,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32629: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32635: 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 32634 "configure"
+#line 32640 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32647,15 +32653,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32653: \$? = $ac_status" >&5
+  echo "$as_me:32659: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32658: \$? = $ac_status" >&5
+  echo "$as_me:32664: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -32671,7 +32677,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:32674: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:32680: 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
@@ -32680,11 +32686,11 @@ EOF
 if test "${ac_cv_type_int+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_int"
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:32683: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:32689: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:32687: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:32693: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
@@ -32698,13 +32704,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:32701: checking for long" >&5
+echo "$as_me:32707: 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 32707 "configure"
+#line 32713 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32719,16 +32725,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32725: \$? = $ac_status" >&5
+  echo "$as_me:32731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32731: \$? = $ac_status" >&5
+  echo "$as_me:32737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_long=yes
 else
@@ -32738,10 +32744,10 @@ ac_cv_type_long=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32741: result: $ac_cv_type_long" >&5
+echo "$as_me:32747: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:32744: checking size of long" >&5
+echo "$as_me:32750: 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
@@ -32750,7 +32756,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32753 "configure"
+#line 32759 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32762,21 +32768,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32765: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32768: \$? = $ac_status" >&5
+  echo "$as_me:32774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32774: \$? = $ac_status" >&5
+  echo "$as_me:32780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32779 "configure"
+#line 32785 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32788,16 +32794,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32791: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32797: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32794: \$? = $ac_status" >&5
+  echo "$as_me:32800: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32800: \$? = $ac_status" >&5
+  echo "$as_me:32806: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32813,7 +32819,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32816 "configure"
+#line 32822 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32825,16 +32831,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32831: \$? = $ac_status" >&5
+  echo "$as_me:32837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32837: \$? = $ac_status" >&5
+  echo "$as_me:32843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32850,7 +32856,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 32853 "configure"
+#line 32859 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32862,16 +32868,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32868: \$? = $ac_status" >&5
+  echo "$as_me:32874: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32874: \$? = $ac_status" >&5
+  echo "$as_me:32880: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32884,12 +32890,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32887: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32893: 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 32892 "configure"
+#line 32898 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32905,15 +32911,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32911: \$? = $ac_status" >&5
+  echo "$as_me:32917: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32916: \$? = $ac_status" >&5
+  echo "$as_me:32922: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -32929,7 +32935,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:32932: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:32938: 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
@@ -32938,11 +32944,11 @@ EOF
 if test "${ac_cv_type_long+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_long"
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:32941: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:32947: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:32945: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:32951: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
@@ -32956,13 +32962,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:32959: checking for off_t" >&5
+echo "$as_me:32965: 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 32965 "configure"
+#line 32971 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32977,16 +32983,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32983: \$? = $ac_status" >&5
+  echo "$as_me:32989: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32989: \$? = $ac_status" >&5
+  echo "$as_me:32995: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32996,10 +33002,10 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32999: result: $ac_cv_type_off_t" >&5
+echo "$as_me:33005: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:33002: checking size of off_t" >&5
+echo "$as_me:33008: 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
@@ -33008,7 +33014,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33011 "configure"
+#line 33017 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33020,21 +33026,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33026: \$? = $ac_status" >&5
+  echo "$as_me:33032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33032: \$? = $ac_status" >&5
+  echo "$as_me:33038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33037 "configure"
+#line 33043 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33046,16 +33052,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33052: \$? = $ac_status" >&5
+  echo "$as_me:33058: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33058: \$? = $ac_status" >&5
+  echo "$as_me:33064: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33071,7 +33077,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33074 "configure"
+#line 33080 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33083,16 +33089,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33089: \$? = $ac_status" >&5
+  echo "$as_me:33095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33095: \$? = $ac_status" >&5
+  echo "$as_me:33101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33108,7 +33114,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 33111 "configure"
+#line 33117 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33120,16 +33126,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33126: \$? = $ac_status" >&5
+  echo "$as_me:33132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33132: \$? = $ac_status" >&5
+  echo "$as_me:33138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33142,12 +33148,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33145: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33151: 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 33150 "configure"
+#line 33156 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33163,15 +33169,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33169: \$? = $ac_status" >&5
+  echo "$as_me:33175: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33174: \$? = $ac_status" >&5
+  echo "$as_me:33180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -33187,7 +33193,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:33190: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:33196: 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
@@ -33196,11 +33202,11 @@ EOF
 if test "${ac_cv_type_off_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_off_t"
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:33199: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:33205: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:33203: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:33209: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
@@ -33214,13 +33220,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:33217: checking for size_t" >&5
+echo "$as_me:33223: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33223 "configure"
+#line 33229 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33235,16 +33241,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33241: \$? = $ac_status" >&5
+  echo "$as_me:33247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33247: \$? = $ac_status" >&5
+  echo "$as_me:33253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -33254,10 +33260,10 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33257: result: $ac_cv_type_size_t" >&5
+echo "$as_me:33263: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:33260: checking size of size_t" >&5
+echo "$as_me:33266: checking size of size_t" >&5
 echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -33266,7 +33272,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33269 "configure"
+#line 33275 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33278,21 +33284,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33284: \$? = $ac_status" >&5
+  echo "$as_me:33290: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33290: \$? = $ac_status" >&5
+  echo "$as_me:33296: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33295 "configure"
+#line 33301 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33304,16 +33310,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33313: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33310: \$? = $ac_status" >&5
+  echo "$as_me:33316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33316: \$? = $ac_status" >&5
+  echo "$as_me:33322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33329,7 +33335,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33332 "configure"
+#line 33338 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33341,16 +33347,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33344: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33347: \$? = $ac_status" >&5
+  echo "$as_me:33353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33353: \$? = $ac_status" >&5
+  echo "$as_me:33359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33366,7 +33372,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 33369 "configure"
+#line 33375 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33378,16 +33384,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33381: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33384: \$? = $ac_status" >&5
+  echo "$as_me:33390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33387: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33390: \$? = $ac_status" >&5
+  echo "$as_me:33396: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33400,12 +33406,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33403: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33409: 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 33408 "configure"
+#line 33414 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33421,15 +33427,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33427: \$? = $ac_status" >&5
+  echo "$as_me:33433: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33429: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33432: \$? = $ac_status" >&5
+  echo "$as_me:33438: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -33445,7 +33451,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:33448: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:33454: result: $ac_cv_sizeof_size_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
@@ -33454,11 +33460,11 @@ EOF
 if test "${ac_cv_type_size_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_size_t"
 	if test "${ac_cv_sizeof_size_t+set}" != set; then
-		{ echo "$as_me:33457: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:33463: WARNING: using 4 for sizeof size_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof size_t" >&2;}
 		ac_cv_sizeof_size_t=4
 	elif test "x${ac_cv_sizeof_size_t}" = x0; then
-		{ echo "$as_me:33461: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:33467: WARNING: sizeof size_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof size_t not found, using 4" >&2;}
 		ac_cv_sizeof_size_t=4
 	fi
@@ -33472,13 +33478,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33475: checking for time_t" >&5
+echo "$as_me:33481: 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 33481 "configure"
+#line 33487 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33493,16 +33499,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33499: \$? = $ac_status" >&5
+  echo "$as_me:33505: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33505: \$? = $ac_status" >&5
+  echo "$as_me:33511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -33512,10 +33518,10 @@ ac_cv_type_time_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33515: result: $ac_cv_type_time_t" >&5
+echo "$as_me:33521: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:33518: checking size of time_t" >&5
+echo "$as_me:33524: 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
@@ -33524,7 +33530,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33527 "configure"
+#line 33533 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33536,21 +33542,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33542: \$? = $ac_status" >&5
+  echo "$as_me:33548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33548: \$? = $ac_status" >&5
+  echo "$as_me:33554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33553 "configure"
+#line 33559 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33562,16 +33568,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33568: \$? = $ac_status" >&5
+  echo "$as_me:33574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33574: \$? = $ac_status" >&5
+  echo "$as_me:33580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33587,7 +33593,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33590 "configure"
+#line 33596 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33599,16 +33605,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33602: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33605: \$? = $ac_status" >&5
+  echo "$as_me:33611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33611: \$? = $ac_status" >&5
+  echo "$as_me:33617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33624,7 +33630,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 33627 "configure"
+#line 33633 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33636,16 +33642,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33642: \$? = $ac_status" >&5
+  echo "$as_me:33648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33648: \$? = $ac_status" >&5
+  echo "$as_me:33654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33658,12 +33664,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33661: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33667: 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 33666 "configure"
+#line 33672 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33679,15 +33685,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33685: \$? = $ac_status" >&5
+  echo "$as_me:33691: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33690: \$? = $ac_status" >&5
+  echo "$as_me:33696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -33703,7 +33709,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:33706: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:33712: 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
@@ -33712,11 +33718,11 @@ EOF
 if test "${ac_cv_type_time_t+set}" = set; then
 	cf_cv_sizeof="$ac_cv_sizeof_time_t"
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:33715: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:33721: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:33719: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:33725: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
@@ -33730,13 +33736,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33733: checking for intptr_t" >&5
+echo "$as_me:33739: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33739 "configure"
+#line 33745 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33751,16 +33757,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33760: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33757: \$? = $ac_status" >&5
+  echo "$as_me:33763: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33763: \$? = $ac_status" >&5
+  echo "$as_me:33769: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -33770,7 +33776,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33773: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:33779: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test "$ac_cv_type_intptr_t" = yes; then
   :
@@ -33784,13 +33790,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:33787: checking for working alloca.h" >&5
+echo "$as_me:33793: 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 33793 "configure"
+#line 33799 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -33802,16 +33808,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33811: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33808: \$? = $ac_status" >&5
+  echo "$as_me:33814: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33814: \$? = $ac_status" >&5
+  echo "$as_me:33820: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -33821,7 +33827,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33824: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:33830: 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
 
@@ -33831,13 +33837,13 @@ EOF
 
 fi
 
-echo "$as_me:33834: checking for alloca" >&5
+echo "$as_me:33840: 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 33840 "configure"
+#line 33846 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -33869,16 +33875,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33878: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33875: \$? = $ac_status" >&5
+  echo "$as_me:33881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33881: \$? = $ac_status" >&5
+  echo "$as_me:33887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -33888,7 +33894,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33891: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:33897: 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
@@ -33909,13 +33915,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:33912: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:33918: 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 33918 "configure"
+#line 33924 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -33933,18 +33939,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:33936: result: $ac_cv_os_cray" >&5
+echo "$as_me:33942: 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:33941: checking for $ac_func" >&5
+echo "$as_me:33947: 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 33947 "configure"
+#line 33953 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33975,16 +33981,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33981: \$? = $ac_status" >&5
+  echo "$as_me:33987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33987: \$? = $ac_status" >&5
+  echo "$as_me:33993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33994,7 +34000,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33997: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34003: 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
 
@@ -34008,7 +34014,7 @@ fi
   done
 fi
 
-echo "$as_me:34011: checking stack direction for C alloca" >&5
+echo "$as_me:34017: 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
@@ -34017,7 +34023,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34020 "configure"
+#line 34026 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -34040,15 +34046,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34046: \$? = $ac_status" >&5
+  echo "$as_me:34052: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34051: \$? = $ac_status" >&5
+  echo "$as_me:34057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -34060,7 +34066,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34063: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:34069: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -34072,23 +34078,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:34075: checking for $ac_header" >&5
+echo "$as_me:34081: 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 34081 "configure"
+#line 34087 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34085: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:34091: \"$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:34091: \$? = $ac_status" >&5
+  echo "$as_me:34097: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34107,7 +34113,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:34110: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:34116: 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
@@ -34120,13 +34126,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34123: checking for $ac_func" >&5
+echo "$as_me:34129: 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 34129 "configure"
+#line 34135 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34157,16 +34163,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34160: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34163: \$? = $ac_status" >&5
+  echo "$as_me:34169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34169: \$? = $ac_status" >&5
+  echo "$as_me:34175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34176,7 +34182,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34179: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34185: 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
@@ -34188,7 +34194,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:34191: checking for working fork" >&5
+  echo "$as_me:34197: 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
@@ -34211,15 +34217,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34217: \$? = $ac_status" >&5
+  echo "$as_me:34223: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34222: \$? = $ac_status" >&5
+  echo "$as_me:34228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -34231,7 +34237,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34234: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:34240: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -34245,12 +34251,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:34248: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34254: 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:34253: checking for working vfork" >&5
+  echo "$as_me:34259: 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
@@ -34259,7 +34265,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34262 "configure"
+#line 34268 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -34356,15 +34362,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34365: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34362: \$? = $ac_status" >&5
+  echo "$as_me:34368: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34367: \$? = $ac_status" >&5
+  echo "$as_me:34373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -34376,13 +34382,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34379: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:34385: 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:34385: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34391: 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
 
@@ -34407,14 +34413,14 @@ EOF
 
 fi
 
-echo "$as_me:34410: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:34416: 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 34417 "configure"
+#line 34423 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34431,16 +34437,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34437: \$? = $ac_status" >&5
+  echo "$as_me:34443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34443: \$? = $ac_status" >&5
+  echo "$as_me:34449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -34448,7 +34454,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34451 "configure"
+#line 34457 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34470,16 +34476,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34473: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34476: \$? = $ac_status" >&5
+  echo "$as_me:34482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34482: \$? = $ac_status" >&5
+  echo "$as_me:34488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -34492,21 +34498,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34495: result: $cf_cv_fionbio" >&5
+echo "$as_me:34501: 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:34502: checking for broken/missing definition of remove" >&5
+echo "$as_me:34508: 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 34509 "configure"
+#line 34515 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34518,23 +34524,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34524: \$? = $ac_status" >&5
+  echo "$as_me:34530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34530: \$? = $ac_status" >&5
+  echo "$as_me:34536: \$? = $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 34537 "configure"
+#line 34543 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -34547,16 +34553,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34553: \$? = $ac_status" >&5
+  echo "$as_me:34559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34559: \$? = $ac_status" >&5
+  echo "$as_me:34565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -34571,21 +34577,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34574: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:34580: 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:34581: checking for lstat" >&5
+echo "$as_me:34587: 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 34588 "configure"
+#line 34594 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34599,16 +34605,16 @@ struct stat sb; lstat(".", &sb); (void) sb
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34605: \$? = $ac_status" >&5
+  echo "$as_me:34611: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34611: \$? = $ac_status" >&5
+  echo "$as_me:34617: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -34620,7 +34626,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34623: result: $ac_cv_func_lstat " >&5
+echo "$as_me:34629: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test "$ac_cv_func_lstat" = yes; then
 
@@ -34630,13 +34636,13 @@ EOF
 
 fi
 
-echo "$as_me:34633: checking for vasprintf" >&5
+echo "$as_me:34639: checking for vasprintf" >&5
 echo $ECHO_N "checking for vasprintf... $ECHO_C" >&6
 if test "${ac_cv_func_vasprintf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34639 "configure"
+#line 34645 "configure"
 #include "confdefs.h"
 #define vasprintf autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34667,16 +34673,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34673: \$? = $ac_status" >&5
+  echo "$as_me:34679: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34679: \$? = $ac_status" >&5
+  echo "$as_me:34685: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vasprintf=yes
 else
@@ -34686,7 +34692,7 @@ ac_cv_func_vasprintf=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34689: result: $ac_cv_func_vasprintf" >&5
+echo "$as_me:34695: result: $ac_cv_func_vasprintf" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
 if test "$ac_cv_func_vasprintf" = yes; then
 
@@ -34694,10 +34700,10 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VASPRINTF 1
 EOF
 
-	echo "$as_me:34697: checking if vasprintf requires workaround" >&5
+	echo "$as_me:34703: checking if vasprintf requires workaround" >&5
 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 34700 "configure"
+#line 34706 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -34713,19 +34719,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34722: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34719: \$? = $ac_status" >&5
+  echo "$as_me:34725: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34725: \$? = $ac_status" >&5
+  echo "$as_me:34731: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-		echo "$as_me:34728: result: no" >&5
+		echo "$as_me:34734: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -34733,7 +34739,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34736 "configure"
+#line 34742 "configure"
 #include "confdefs.h"
 
 			#ifndef _GNU_SOURCE
@@ -34752,19 +34758,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34758: \$? = $ac_status" >&5
+  echo "$as_me:34764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34764: \$? = $ac_status" >&5
+  echo "$as_me:34770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-			echo "$as_me:34767: result: yes" >&5
+			echo "$as_me:34773: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
@@ -34774,7 +34780,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			echo "$as_me:34777: result: unknown" >&5
+			echo "$as_me:34783: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
 
 fi
@@ -34807,13 +34813,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34810: checking for $ac_func" >&5
+echo "$as_me:34816: 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 34816 "configure"
+#line 34822 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34844,16 +34850,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34850: \$? = $ac_status" >&5
+  echo "$as_me:34856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34856: \$? = $ac_status" >&5
+  echo "$as_me:34862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34863,7 +34869,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34866: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34872: 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
@@ -34877,13 +34883,13 @@ for ac_func in \
 	mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34880: checking for $ac_func" >&5
+echo "$as_me:34886: 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 34886 "configure"
+#line 34892 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34914,16 +34920,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34920: \$? = $ac_status" >&5
+  echo "$as_me:34926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34926: \$? = $ac_status" >&5
+  echo "$as_me:34932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34933,7 +34939,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34936: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34942: 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
@@ -34945,13 +34951,13 @@ else
 for ac_func in mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34948: checking for $ac_func" >&5
+echo "$as_me:34954: 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 34954 "configure"
+#line 34960 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34982,16 +34988,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34988: \$? = $ac_status" >&5
+  echo "$as_me:34994: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34994: \$? = $ac_status" >&5
+  echo "$as_me:35000: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35001,7 +35007,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35004: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35010: 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
@@ -35021,13 +35027,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35024: checking for $ac_func" >&5
+echo "$as_me:35030: 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 35030 "configure"
+#line 35036 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -35058,16 +35064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35064: \$? = $ac_status" >&5
+  echo "$as_me:35070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35070: \$? = $ac_status" >&5
+  echo "$as_me:35076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35077,7 +35083,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35080: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35086: 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
@@ -35089,7 +35095,7 @@ else
 fi
 done
 
-echo "$as_me:35092: checking for random-integer functions" >&5
+echo "$as_me:35098: 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
@@ -35109,12 +35115,10 @@ do
 	esac
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35112 "configure"
+#line 35118 "configure"
 #include "confdefs.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+$ac_includes_default
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -35128,16 +35132,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func(); (void)seed
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35134: \$? = $ac_status" >&5
+  echo "$as_me:35138: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35140: \$? = $ac_status" >&5
+  echo "$as_me:35144: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -35149,10 +35153,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:35152: result: $cf_cv_srand_func" >&5
+echo "$as_me:35156: 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:35155: checking for range of random-integers" >&5
+	echo "$as_me:35159: 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
@@ -35173,7 +35177,7 @@ else
 			;;
 		esac
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35176 "configure"
+#line 35180 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35192,16 +35196,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35198: \$? = $ac_status" >&5
+  echo "$as_me:35202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35204: \$? = $ac_status" >&5
+  echo "$as_me:35208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -35212,15 +35216,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35215: result: $cf_cv_rand_max" >&5
+echo "$as_me:35219: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:35220: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:35224: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35223 "configure"
+#line 35227 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35233,23 +35237,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35239: \$? = $ac_status" >&5
+  echo "$as_me:35243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35242: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35245: \$? = $ac_status" >&5
+  echo "$as_me:35249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35252 "configure"
+#line 35256 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -35261,16 +35265,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35267: \$? = $ac_status" >&5
+  echo "$as_me:35271: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35273: \$? = $ac_status" >&5
+  echo "$as_me:35277: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -35281,7 +35285,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:35284: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:35288: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -35291,10 +35295,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:35294: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:35298: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 35297 "configure"
+#line 35301 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35307,23 +35311,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35314: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35313: \$? = $ac_status" >&5
+  echo "$as_me:35317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35319: \$? = $ac_status" >&5
+  echo "$as_me:35323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35326 "configure"
+#line 35330 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35335,16 +35339,16 @@ unsigned x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35338: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35341: \$? = $ac_status" >&5
+  echo "$as_me:35345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35347: \$? = $ac_status" >&5
+  echo "$as_me:35351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -35355,7 +35359,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:35358: result: $cf_bsd_random_h" >&5
+			echo "$as_me:35362: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -35365,7 +35369,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:35368: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:35372: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -35400,13 +35404,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:35403: checking for $ac_func declaration" >&5
+echo "$as_me:35407: 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 35409 "configure"
+#line 35413 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35427,20 +35431,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35433: \$? = $ac_status" >&5
+  echo "$as_me:35437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35439: \$? = $ac_status" >&5
+  echo "$as_me:35443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35443 "configure"
+#line 35447 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35461,16 +35465,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35464: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35467: \$? = $ac_status" >&5
+  echo "$as_me:35471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35473: \$? = $ac_status" >&5
+  echo "$as_me:35477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35491,11 +35495,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:35494: result: yes" >&5
+  echo "$as_me:35498: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35498: result: no" >&5
+  echo "$as_me:35502: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35510,13 +35514,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:35513: checking for $ac_func declaration" >&5
+echo "$as_me:35517: 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 35519 "configure"
+#line 35523 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35530,20 +35534,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35536: \$? = $ac_status" >&5
+  echo "$as_me:35540: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35542: \$? = $ac_status" >&5
+  echo "$as_me:35546: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35546 "configure"
+#line 35550 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35557,16 +35561,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35563: \$? = $ac_status" >&5
+  echo "$as_me:35567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35569: \$? = $ac_status" >&5
+  echo "$as_me:35573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35587,11 +35591,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:35590: result: yes" >&5
+  echo "$as_me:35594: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35594: result: no" >&5
+  echo "$as_me:35598: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35606,13 +35610,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35609: checking for $ac_func declaration" >&5
+echo "$as_me:35613: 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 35615 "configure"
+#line 35619 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35628,20 +35632,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35631: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35634: \$? = $ac_status" >&5
+  echo "$as_me:35638: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35640: \$? = $ac_status" >&5
+  echo "$as_me:35644: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35644 "configure"
+#line 35648 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35657,16 +35661,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35660: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35663: \$? = $ac_status" >&5
+  echo "$as_me:35667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35669: \$? = $ac_status" >&5
+  echo "$as_me:35673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35687,11 +35691,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:35690: result: yes" >&5
+  echo "$as_me:35694: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35694: result: no" >&5
+  echo "$as_me:35698: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35703,14 +35707,14 @@ EOF
 fi
 done
 
-echo "$as_me:35706: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35710: 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 35713 "configure"
+#line 35717 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35724,16 +35728,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35730: \$? = $ac_status" >&5
+  echo "$as_me:35734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35736: \$? = $ac_status" >&5
+  echo "$as_me:35740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35744,7 +35748,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35747: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35751: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35758,14 +35762,14 @@ EOF
 
 fi
 
-echo "$as_me:35761: checking if external errno is declared" >&5
+echo "$as_me:35765: 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 35768 "configure"
+#line 35772 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35783,16 +35787,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35789: \$? = $ac_status" >&5
+  echo "$as_me:35793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35795: \$? = $ac_status" >&5
+  echo "$as_me:35799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -35803,7 +35807,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35806: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:35810: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -35818,14 +35822,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35821: checking if external errno exists" >&5
+echo "$as_me:35825: 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 35828 "configure"
+#line 35832 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -35840,16 +35844,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35846: \$? = $ac_status" >&5
+  echo "$as_me:35850: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35852: \$? = $ac_status" >&5
+  echo "$as_me:35856: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -35860,7 +35864,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35863: result: $cf_cv_have_errno" >&5
+echo "$as_me:35867: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -35873,7 +35877,7 @@ EOF
 
 fi
 
-echo "$as_me:35876: checking if we can set errno" >&5
+echo "$as_me:35880: 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
@@ -35881,7 +35885,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35884 "configure"
+#line 35888 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -35893,16 +35897,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35899: \$? = $ac_status" >&5
+  echo "$as_me:35903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35905: \$? = $ac_status" >&5
+  echo "$as_me:35909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -35913,7 +35917,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35916 "configure"
+#line 35920 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -35924,15 +35928,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:35927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35930: \$? = $ac_status" >&5
+  echo "$as_me:35934: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:35932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35935: \$? = $ac_status" >&5
+  echo "$as_me:35939: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -35945,21 +35949,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:35948: result: $cf_cv_set_errno" >&5
+echo "$as_me:35952: 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:35955: checking for setlocale()" >&5
+echo "$as_me:35959: 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 35962 "configure"
+#line 35966 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -35971,16 +35975,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35977: \$? = $ac_status" >&5
+  echo "$as_me:35981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35983: \$? = $ac_status" >&5
+  echo "$as_me:35987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -35992,7 +35996,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:35995: result: $cf_cv_locale" >&5
+echo "$as_me:35999: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -36000,14 +36004,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:36003: checking if NGROUPS is defined" >&5
+echo "$as_me:36007: 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 36010 "configure"
+#line 36014 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -36026,23 +36030,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36032: \$? = $ac_status" >&5
+  echo "$as_me:36036: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36038: \$? = $ac_status" >&5
+  echo "$as_me:36042: \$? = $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 36045 "configure"
+#line 36049 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -36061,16 +36065,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36067: \$? = $ac_status" >&5
+  echo "$as_me:36071: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36073: \$? = $ac_status" >&5
+  echo "$as_me:36077: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -36082,7 +36086,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:36085: result: $cf_cv_ngroups" >&5
+echo "$as_me:36089: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -36103,13 +36107,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36106: checking for $ac_func" >&5
+echo "$as_me:36110: 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 36112 "configure"
+#line 36116 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -36140,16 +36144,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36146: \$? = $ac_status" >&5
+  echo "$as_me:36150: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36152: \$? = $ac_status" >&5
+  echo "$as_me:36156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36159,7 +36163,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:36162: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:36166: 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
@@ -36168,14 +36172,14 @@ EOF
 
 else
 
-echo "$as_me:36171: checking if external sys_nerr is declared" >&5
+echo "$as_me:36175: 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 36178 "configure"
+#line 36182 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36193,16 +36197,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36200: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36199: \$? = $ac_status" >&5
+  echo "$as_me:36203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36205: \$? = $ac_status" >&5
+  echo "$as_me:36209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -36213,7 +36217,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36216: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:36220: 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
@@ -36228,14 +36232,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36231: checking if external sys_nerr exists" >&5
+echo "$as_me:36235: 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 36238 "configure"
+#line 36242 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -36250,16 +36254,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36256: \$? = $ac_status" >&5
+  echo "$as_me:36260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36262: \$? = $ac_status" >&5
+  echo "$as_me:36266: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -36270,7 +36274,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36273: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:36277: 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
@@ -36283,14 +36287,14 @@ EOF
 
 fi
 
-echo "$as_me:36286: checking if external sys_errlist is declared" >&5
+echo "$as_me:36290: 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 36293 "configure"
+#line 36297 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -36308,16 +36312,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36314: \$? = $ac_status" >&5
+  echo "$as_me:36318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36320: \$? = $ac_status" >&5
+  echo "$as_me:36324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -36328,7 +36332,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36331: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:36335: 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
@@ -36343,14 +36347,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36346: checking if external sys_errlist exists" >&5
+echo "$as_me:36350: 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 36353 "configure"
+#line 36357 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -36365,16 +36369,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36372: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36371: \$? = $ac_status" >&5
+  echo "$as_me:36375: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36377: \$? = $ac_status" >&5
+  echo "$as_me:36381: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -36385,7 +36389,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36388: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:36392: 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
@@ -36404,23 +36408,23 @@ done
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36407: checking for $ac_header" >&5
+echo "$as_me:36411: 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 36413 "configure"
+#line 36417 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36417: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:36421: \"$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:36423: \$? = $ac_status" >&5
+  echo "$as_me:36427: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36439,7 +36443,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:36442: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:36446: 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
@@ -36449,14 +36453,14 @@ EOF
 fi
 done
 
-echo "$as_me:36452: checking for lastlog path" >&5
+echo "$as_me:36456: 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 36459 "configure"
+#line 36463 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36476,16 +36480,16 @@ char *path = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36482: \$? = $ac_status" >&5
+  echo "$as_me:36486: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36488: \$? = $ac_status" >&5
+  echo "$as_me:36492: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36500,14 +36504,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36503: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36507: 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:36510: checking for utmp implementation" >&5
+echo "$as_me:36514: 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
@@ -36524,7 +36528,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36527 "configure"
+#line 36531 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36540,16 +36544,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36543: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36547: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36546: \$? = $ac_status" >&5
+  echo "$as_me:36550: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36552: \$? = $ac_status" >&5
+  echo "$as_me:36556: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36558,7 +36562,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36561 "configure"
+#line 36565 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36574,16 +36578,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36577: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36580: \$? = $ac_status" >&5
+  echo "$as_me:36584: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36586: \$? = $ac_status" >&5
+  echo "$as_me:36590: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36598,7 +36602,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36601: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36605: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36613,14 +36617,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36616: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36620: 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 36623 "configure"
+#line 36627 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36637,16 +36641,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36643: \$? = $ac_status" >&5
+  echo "$as_me:36647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36649: \$? = $ac_status" >&5
+  echo "$as_me:36653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36658,7 +36662,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36661: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36665: 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
@@ -36668,14 +36672,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36671: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36675: 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 36678 "configure"
+#line 36682 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36692,16 +36696,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36698: \$? = $ac_status" >&5
+  echo "$as_me:36702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36704: \$? = $ac_status" >&5
+  echo "$as_me:36708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36713,7 +36717,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36716: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36720: 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
@@ -36723,7 +36727,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36726: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36730: 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
@@ -36740,7 +36744,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36743 "configure"
+#line 36747 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36756,16 +36760,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36762: \$? = $ac_status" >&5
+  echo "$as_me:36766: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36768: \$? = $ac_status" >&5
+  echo "$as_me:36772: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36777,12 +36781,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36780: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:36784: 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
 (no)
-	{ { echo "$as_me:36785: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:36789: 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; }; }
 	;;
@@ -36797,7 +36801,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36800: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:36804: 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
@@ -36810,7 +36814,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36813 "configure"
+#line 36817 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36827,16 +36831,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36833: \$? = $ac_status" >&5
+  echo "$as_me:36837: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36839: \$? = $ac_status" >&5
+  echo "$as_me:36843: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -36849,7 +36853,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36852: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:36856: 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
 
@@ -36865,14 +36869,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36868: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:36872: 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 36875 "configure"
+#line 36879 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36889,23 +36893,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36892: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36895: \$? = $ac_status" >&5
+  echo "$as_me:36899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36901: \$? = $ac_status" >&5
+  echo "$as_me:36905: \$? = $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 36908 "configure"
+#line 36912 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36922,16 +36926,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36928: \$? = $ac_status" >&5
+  echo "$as_me:36932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36934: \$? = $ac_status" >&5
+  echo "$as_me:36938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -36945,7 +36949,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36948: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:36952: 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
 
@@ -36964,14 +36968,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36967: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:36971: 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 36974 "configure"
+#line 36978 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36988,16 +36992,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36994: \$? = $ac_status" >&5
+  echo "$as_me:36998: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37000: \$? = $ac_status" >&5
+  echo "$as_me:37004: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -37008,7 +37012,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37011: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:37015: 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
 
@@ -37019,7 +37023,7 @@ EOF
 fi
 fi
 
-echo "$as_me:37022: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:37026: 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
@@ -37027,7 +37031,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37030 "configure"
+#line 37034 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37046,16 +37050,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37049: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37052: \$? = $ac_status" >&5
+  echo "$as_me:37056: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37058: \$? = $ac_status" >&5
+  echo "$as_me:37062: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -37066,7 +37070,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37069: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:37073: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -37075,14 +37079,14 @@ EOF
 
 fi
 
-echo "$as_me:37078: checking if external h_errno exists" >&5
+echo "$as_me:37082: 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 37085 "configure"
+#line 37089 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -37097,16 +37101,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37103: \$? = $ac_status" >&5
+  echo "$as_me:37107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37109: \$? = $ac_status" >&5
+  echo "$as_me:37113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -37117,7 +37121,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37120: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:37124: 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
@@ -37130,7 +37134,7 @@ EOF
 
 fi
 
-echo "$as_me:37133: checking if bibp: URLs should be supported" >&5
+echo "$as_me:37137: 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.
@@ -37147,14 +37151,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:37150: result: $use_bibp_urls" >&5
+echo "$as_me:37154: 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:37157: checking if configuration info should be browsable" >&5
+echo "$as_me:37161: 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.
@@ -37171,14 +37175,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:37174: result: $use_config_info" >&5
+echo "$as_me:37178: 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:37181: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:37185: 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.
@@ -37195,14 +37199,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:37198: result: $use_forms_options" >&5
+echo "$as_me:37202: 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:37205: checking if old-style options menu should be used" >&5
+echo "$as_me:37209: 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.
@@ -37219,14 +37223,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:37222: result: $use_menu_options" >&5
+echo "$as_me:37226: 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:37229: checking if sessions code should be used" >&5
+echo "$as_me:37233: 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.
@@ -37243,7 +37247,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:37246: result: $use_sessions" >&5
+echo "$as_me:37250: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -37254,7 +37258,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:37257: checking if session-caching code should be used" >&5
+echo "$as_me:37261: 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.
@@ -37271,7 +37275,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:37274: result: $use_session_cache" >&5
+echo "$as_me:37278: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -37281,7 +37285,7 @@ EOF
 
 fi
 
-echo "$as_me:37284: checking if address-list page should be used" >&5
+echo "$as_me:37288: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -37298,14 +37302,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:37301: result: $use_addrlist_page" >&5
+echo "$as_me:37305: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test "$use_addrlist_page" != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:37308: checking if support for CJK should be used" >&5
+echo "$as_me:37312: checking if support for CJK should be used" >&5
 echo $ECHO_N "checking if support for CJK should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -37322,7 +37326,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:37325: result: $use_cjk" >&5
+echo "$as_me:37329: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -37372,7 +37376,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37375 "configure"
+#line 37379 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37384,16 +37388,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37391: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37390: \$? = $ac_status" >&5
+  echo "$as_me:37394: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37396: \$? = $ac_status" >&5
+  echo "$as_me:37400: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37410,7 +37414,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}:37413: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37417: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37456,7 +37460,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37459 "configure"
+#line 37463 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37468,16 +37472,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37474: \$? = $ac_status" >&5
+  echo "$as_me:37478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37480: \$? = $ac_status" >&5
+  echo "$as_me:37484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37494,7 +37498,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}:37497: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37501: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37512,7 +37516,7 @@ echo "${as_me:-configure}:37497: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37515: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37519: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37537,7 +37541,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}:37540: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37544: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37566,7 +37570,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}:37569: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37573: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37575,7 +37579,7 @@ echo "${as_me:-configure}:37569: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37578: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37582: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37586,7 +37590,7 @@ esac
 
 fi;
 
-  echo "$as_me:37589: checking for iconv" >&5
+  echo "$as_me:37593: 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
@@ -37597,12 +37601,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37600: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37604: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37605 "configure"
+#line 37609 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37621,16 +37625,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37627: \$? = $ac_status" >&5
+  echo "$as_me:37631: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37633: \$? = $ac_status" >&5
+  echo "$as_me:37637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37644,7 +37648,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37647 "configure"
+#line 37651 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37663,16 +37667,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37666: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37669: \$? = $ac_status" >&5
+  echo "$as_me:37673: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37675: \$? = $ac_status" >&5
+  echo "$as_me:37679: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37689,9 +37693,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37692: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37696: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37694: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37698: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37782,7 +37786,7 @@ 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}:37785: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37789: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37790,7 +37794,7 @@ echo "${as_me:-configure}:37785: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 37793 "configure"
+#line 37797 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37809,21 +37813,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37815: \$? = $ac_status" >&5
+  echo "$as_me:37819: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37821: \$? = $ac_status" >&5
+  echo "$as_me:37825: \$? = $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}:37826: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37830: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37841,7 +37845,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:37844: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37848: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -37916,13 +37920,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}:37919: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37923: 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 37925 "configure"
+#line 37929 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37941,21 +37945,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37947: \$? = $ac_status" >&5
+  echo "$as_me:37951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37953: \$? = $ac_status" >&5
+  echo "$as_me:37957: \$? = $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}:37958: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37962: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -37995,7 +37999,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:37998: result: $am_cv_func_iconv" >&5
+echo "$as_me:38002: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -38004,14 +38008,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:38007: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:38011: 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 38014 "configure"
+#line 38018 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38036,16 +38040,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38043: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38042: \$? = $ac_status" >&5
+  echo "$as_me:38046: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38048: \$? = $ac_status" >&5
+  echo "$as_me:38052: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -38055,7 +38059,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:38058: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:38062: 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
@@ -38100,7 +38104,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38103 "configure"
+#line 38107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38112,16 +38116,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38118: \$? = $ac_status" >&5
+  echo "$as_me:38122: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38124: \$? = $ac_status" >&5
+  echo "$as_me:38128: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38138,7 +38142,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}:38141: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38145: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38177,7 +38181,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}:38180: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38184: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38191,7 +38195,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:38194: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:38198: checking if experimental support for Chinese UTF-8 should be used" >&5
 echo $ECHO_N "checking if experimental support for Chinese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-chinese-utf8 or --disable-chinese-utf8 was given.
@@ -38208,7 +38212,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:38211: result: $use_cn_utf8" >&5
+echo "$as_me:38215: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -38219,7 +38223,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:38222: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:38226: checking if support for Japanese UTF-8 should be used" >&5
 echo $ECHO_N "checking if support for Japanese UTF-8 should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -38236,7 +38240,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:38239: result: $use_ja_utf8" >&5
+echo "$as_me:38243: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -38257,11 +38261,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:38260: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:38264: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:38264: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:38268: checking if experimental wcwidth/UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental wcwidth/UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-wcwidth-support or --disable-wcwidth-support was given.
@@ -38278,7 +38282,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:38281: result: $use_wcwidth" >&5
+echo "$as_me:38285: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -38293,7 +38297,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:38296: checking if you want to use default-colors" >&5
+echo "$as_me:38300: 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.
@@ -38310,7 +38314,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:38313: result: $use_dft_colors" >&5
+echo "$as_me:38317: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -38319,7 +38323,7 @@ EOF
 
 fi
 
-echo "$as_me:38322: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:38326: 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.
@@ -38336,14 +38340,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:38339: result: $use_kbd_layout" >&5
+echo "$as_me:38343: 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:38346: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:38350: 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.
@@ -38360,14 +38364,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:38363: result: $use_nested_tables" >&5
+echo "$as_me:38367: 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:38370: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:38374: 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.
@@ -38384,14 +38388,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:38387: result: $use_alt_bindings" >&5
+echo "$as_me:38391: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test "$use_alt_bindings" != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:38394: checking if ascii case-conversion should be used" >&5
+echo "$as_me:38398: 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.
@@ -38408,14 +38412,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:38411: result: $use_ascii_ctypes" >&5
+echo "$as_me:38415: 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:38418: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:38422: 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.
@@ -38432,14 +38436,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:38435: result: $use_ext_htmldtd" >&5
+echo "$as_me:38439: 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:38442: checking if file-upload logic should be used" >&5
+echo "$as_me:38446: 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.
@@ -38456,14 +38460,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:38459: result: $use_file_upload" >&5
+echo "$as_me:38463: 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:38466: checking if IDNA support should be used" >&5
+echo "$as_me:38470: 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.
@@ -38480,7 +38484,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:38483: result: $use_idna" >&5
+echo "$as_me:38487: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38522,7 +38526,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38525 "configure"
+#line 38529 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38534,16 +38538,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38540: \$? = $ac_status" >&5
+  echo "$as_me:38544: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38546: \$? = $ac_status" >&5
+  echo "$as_me:38550: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38560,7 +38564,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}:38563: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38567: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38606,7 +38610,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38609 "configure"
+#line 38613 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38618,16 +38622,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38625: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38624: \$? = $ac_status" >&5
+  echo "$as_me:38628: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38630: \$? = $ac_status" >&5
+  echo "$as_me:38634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38644,7 +38648,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}:38647: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38651: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38662,7 +38666,7 @@ echo "${as_me:-configure}:38647: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38665: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38669: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38687,7 +38691,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}:38690: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38694: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38716,7 +38720,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}:38719: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38723: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38725,7 +38729,7 @@ echo "${as_me:-configure}:38719: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38728: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38732: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38739,12 +38743,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38742: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38746: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38747 "configure"
+#line 38751 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38763,16 +38767,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38769: \$? = $ac_status" >&5
+  echo "$as_me:38773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38775: \$? = $ac_status" >&5
+  echo "$as_me:38779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38786,7 +38790,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38789 "configure"
+#line 38793 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38805,16 +38809,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38811: \$? = $ac_status" >&5
+  echo "$as_me:38815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38817: \$? = $ac_status" >&5
+  echo "$as_me:38821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38831,9 +38835,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:38834: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:38838: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:38836: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38840: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38924,7 +38928,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_idn2" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38927: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38931: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38932,7 +38936,7 @@ echo "${as_me:-configure}:38927: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38935 "configure"
+#line 38939 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38951,21 +38955,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38957: \$? = $ac_status" >&5
+  echo "$as_me:38961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38963: \$? = $ac_status" >&5
+  echo "$as_me:38967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found idn2 headers in $cf_cv_header_path_idn2" 1>&6
 
-echo "${as_me:-configure}:38968: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38972: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38983,7 +38987,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:38986: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38990: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39058,13 +39062,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_idn2" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:39061: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39065: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn2"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 39067 "configure"
+#line 39071 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39083,21 +39087,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39089: \$? = $ac_status" >&5
+  echo "$as_me:39093: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39095: \$? = $ac_status" >&5
+  echo "$as_me:39099: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found idn2 library in $cf_cv_library_path_idn2" 1>&6
 
-echo "${as_me:-configure}:39100: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39104: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -39159,7 +39163,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39162 "configure"
+#line 39166 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39171,16 +39175,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39177: \$? = $ac_status" >&5
+  echo "$as_me:39181: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39183: \$? = $ac_status" >&5
+  echo "$as_me:39187: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39197,7 +39201,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}:39200: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39204: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39233,7 +39237,7 @@ if test -n "$cf_cv_library_path_idn2" ; 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}:39236: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39240: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39260,14 +39264,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:39263: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:39267: testing unsuccessful, will try idn (older) ..." 1>&5
 
 fi
 
 if test "x$cf_cv_find_linkage_idn2" = xyes ; then
 	test -n "$verbose" && echo "	found idn2 library" 1>&6
 
-echo "${as_me:-configure}:39270: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:39274: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -39280,12 +39284,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:39283: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39287: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39288 "configure"
+#line 39292 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39304,16 +39308,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39310: \$? = $ac_status" >&5
+  echo "$as_me:39314: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39316: \$? = $ac_status" >&5
+  echo "$as_me:39320: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39327,7 +39331,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39330 "configure"
+#line 39334 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39346,16 +39350,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39352: \$? = $ac_status" >&5
+  echo "$as_me:39356: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39355: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39358: \$? = $ac_status" >&5
+  echo "$as_me:39362: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39372,9 +39376,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:39375: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:39379: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:39377: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39381: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39465,7 +39469,7 @@ 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}:39468: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39472: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39473,7 +39477,7 @@ echo "${as_me:-configure}:39468: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39476 "configure"
+#line 39480 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39492,21 +39496,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39498: \$? = $ac_status" >&5
+  echo "$as_me:39502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39504: \$? = $ac_status" >&5
+  echo "$as_me:39508: \$? = $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}:39509: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39513: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39524,7 +39528,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39527: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39531: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39599,13 +39603,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}:39602: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39606: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 39608 "configure"
+#line 39612 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39624,21 +39628,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39630: \$? = $ac_status" >&5
+  echo "$as_me:39634: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39637: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39636: \$? = $ac_status" >&5
+  echo "$as_me:39640: \$? = $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}:39641: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39645: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39700,7 +39704,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39703 "configure"
+#line 39707 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39712,16 +39716,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39718: \$? = $ac_status" >&5
+  echo "$as_me:39722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39724: \$? = $ac_status" >&5
+  echo "$as_me:39728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39738,7 +39742,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}:39741: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39745: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39774,7 +39778,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}:39777: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39781: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39799,14 +39803,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:39802: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:39806: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
 	test -n "$verbose" && echo "	found idn library" 1>&6
 
-echo "${as_me:-configure}:39809: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:39813: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -39817,7 +39821,7 @@ fi
 
 fi
 
-echo "$as_me:39820: checking if element-justification logic should be used" >&5
+echo "$as_me:39824: 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.
@@ -39834,14 +39838,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:39837: result: $use_justify_elts" >&5
+echo "$as_me:39841: 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:39844: checking if partial-display should be used" >&5
+echo "$as_me:39848: 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.
@@ -39858,14 +39862,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:39861: result: $use_partial_display" >&5
+echo "$as_me:39865: 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:39868: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:39872: 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.
@@ -39882,14 +39886,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:39885: result: $use_filed_cookies" >&5
+echo "$as_me:39889: 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:39892: checking if html source should be colorized" >&5
+echo "$as_me:39896: 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.
@@ -39906,14 +39910,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:39909: result: $use_prettysrc" >&5
+echo "$as_me:39913: 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:39916: checking if progress-bar code should be used" >&5
+echo "$as_me:39920: 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.
@@ -39930,14 +39934,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:39933: result: $use_progressbar" >&5
+echo "$as_me:39937: 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:39940: checking if read-progress message should show ETA" >&5
+echo "$as_me:39944: 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.
@@ -39954,14 +39958,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:39957: result: $use_read_eta" >&5
+echo "$as_me:39961: 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:39964: checking if source caching should be used" >&5
+echo "$as_me:39968: 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.
@@ -39978,14 +39982,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:39981: result: $use_source_cache" >&5
+echo "$as_me:39985: 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:39988: checking if scrollbar code should be used" >&5
+echo "$as_me:39992: 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.
@@ -40002,10 +40006,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:40005: result: $use_scrollbar" >&5
+echo "$as_me:40009: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:40008: checking if charset-selection logic should be used" >&5
+echo "$as_me:40012: 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.
@@ -40022,14 +40026,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:40025: result: $use_charset_choice" >&5
+echo "$as_me:40029: 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:40032: checking if you want to use external commands" >&5
+echo "$as_me:40036: 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.
@@ -40046,7 +40050,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:40049: result: $use_externs" >&5
+echo "$as_me:40053: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -40057,7 +40061,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:40060: checking if you want to use setfont support" >&5
+echo "$as_me:40064: 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.
@@ -40074,7 +40078,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:40077: result: $use_setfont" >&5
+echo "$as_me:40081: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -40085,7 +40089,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:40088: checking for $ac_word" >&5
+echo "$as_me:40092: 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
@@ -40102,7 +40106,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:40105: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40109: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -40113,10 +40117,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:40116: result: $SETFONT" >&5
+  echo "$as_me:40120: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:40119: result: no" >&5
+  echo "$as_me:40123: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40175,7 +40179,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:40178: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40182: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -40193,19 +40197,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:40196: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:40200: 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}:40203: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:40207: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:40208: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:40212: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -40216,7 +40220,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:40219: checking if you want cgi-link support" >&5
+echo "$as_me:40223: 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.
@@ -40233,10 +40237,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:40236: result: $enableval" >&5
+echo "$as_me:40240: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:40239: checking if you want change-exec support" >&5
+echo "$as_me:40243: 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.
@@ -40253,14 +40257,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:40256: result: $use_change_exec" >&5
+echo "$as_me:40260: 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:40263: checking if you want exec-links support" >&5
+echo "$as_me:40267: 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.
@@ -40277,14 +40281,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:40280: result: $use_exec_links" >&5
+echo "$as_me:40284: 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:40287: checking if you want exec-scripts support" >&5
+echo "$as_me:40291: 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.
@@ -40301,14 +40305,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:40304: result: $use_exec_scripts" >&5
+echo "$as_me:40308: 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:40311: checking if you want internal-links feature" >&5
+echo "$as_me:40315: 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.
@@ -40325,14 +40329,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:40328: result: $use_internal_links" >&5
+echo "$as_me:40332: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test "$use_internal_links" = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:40335: checking if you want to fork NSL requests" >&5
+echo "$as_me:40339: 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.
@@ -40349,7 +40353,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:40352: result: $use_nsl_fork" >&5
+echo "$as_me:40356: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -40370,7 +40374,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:40373: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:40377: 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.
@@ -40387,14 +40391,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:40390: result: $use_syslog" >&5
+echo "$as_me:40394: 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:40397: checking if you want to underline links" >&5
+echo "$as_me:40401: 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.
@@ -40411,7 +40415,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:40414: result: $use_underline" >&5
+echo "$as_me:40418: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -40423,7 +40427,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:40426: checking if help files should be gzip'ed" >&5
+echo "$as_me:40430: 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.
@@ -40440,10 +40444,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:40443: result: $use_gzip_help" >&5
+echo "$as_me:40447: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:40446: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:40450: 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.
@@ -40453,7 +40457,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:40456: result: $use_bzlib" >&5
+echo "$as_me:40460: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40495,7 +40499,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40498 "configure"
+#line 40502 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40507,16 +40511,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40513: \$? = $ac_status" >&5
+  echo "$as_me:40517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40519: \$? = $ac_status" >&5
+  echo "$as_me:40523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40533,7 +40537,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}:40536: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40540: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40579,7 +40583,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40582 "configure"
+#line 40586 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40591,16 +40595,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40597: \$? = $ac_status" >&5
+  echo "$as_me:40601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40603: \$? = $ac_status" >&5
+  echo "$as_me:40607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40617,7 +40621,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}:40620: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40624: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40635,7 +40639,7 @@ echo "${as_me:-configure}:40620: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40638: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40642: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40660,7 +40664,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}:40663: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40667: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40689,7 +40693,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}:40692: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40696: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40698,7 +40702,7 @@ echo "${as_me:-configure}:40692: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40701: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40705: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40712,12 +40716,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40715: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40719: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40720 "configure"
+#line 40724 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40734,16 +40738,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40740: \$? = $ac_status" >&5
+  echo "$as_me:40744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40746: \$? = $ac_status" >&5
+  echo "$as_me:40750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40757,7 +40761,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40760 "configure"
+#line 40764 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40774,16 +40778,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40780: \$? = $ac_status" >&5
+  echo "$as_me:40784: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40786: \$? = $ac_status" >&5
+  echo "$as_me:40790: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40800,9 +40804,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:40803: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:40807: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:40805: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40809: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40893,7 +40897,7 @@ 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}:40896: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40900: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -40901,7 +40905,7 @@ echo "${as_me:-configure}:40896: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 40904 "configure"
+#line 40908 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40918,21 +40922,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40921: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40924: \$? = $ac_status" >&5
+  echo "$as_me:40928: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40930: \$? = $ac_status" >&5
+  echo "$as_me:40934: \$? = $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}:40935: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40939: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40950,7 +40954,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:40953: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40957: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -40958,7 +40962,7 @@ echo "${as_me:-configure}:40953: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 40961 "configure"
+#line 40965 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40975,21 +40979,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40981: \$? = $ac_status" >&5
+  echo "$as_me:40985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40987: \$? = $ac_status" >&5
+  echo "$as_me:40991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:40992: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:40996: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -41070,13 +41074,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}:41073: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41077: 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 41079 "configure"
+#line 41083 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -41093,21 +41097,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41096: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41099: \$? = $ac_status" >&5
+  echo "$as_me:41103: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41105: \$? = $ac_status" >&5
+  echo "$as_me:41109: \$? = $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}:41110: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41114: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -41169,7 +41173,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41172 "configure"
+#line 41176 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41181,16 +41185,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41187: \$? = $ac_status" >&5
+  echo "$as_me:41191: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41193: \$? = $ac_status" >&5
+  echo "$as_me:41197: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41207,7 +41211,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}:41210: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41214: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41243,7 +41247,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}:41246: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41250: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41268,7 +41272,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41271: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:41275: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -41279,7 +41283,7 @@ EOF
 
 fi
 
-echo "$as_me:41282: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:41286: 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.
@@ -41289,7 +41293,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:41292: result: $use_zlib" >&5
+echo "$as_me:41296: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -41331,7 +41335,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41334 "configure"
+#line 41338 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41343,16 +41347,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41349: \$? = $ac_status" >&5
+  echo "$as_me:41353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41355: \$? = $ac_status" >&5
+  echo "$as_me:41359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41369,7 +41373,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}:41372: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41376: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41415,7 +41419,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41418 "configure"
+#line 41422 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41427,16 +41431,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41433: \$? = $ac_status" >&5
+  echo "$as_me:41437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41439: \$? = $ac_status" >&5
+  echo "$as_me:41443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41453,7 +41457,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}:41456: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41460: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41471,7 +41475,7 @@ echo "${as_me:-configure}:41456: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41474: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41478: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41496,7 +41500,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}:41499: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41503: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41525,7 +41529,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}:41528: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41532: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41534,7 +41538,7 @@ echo "${as_me:-configure}:41528: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41537: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41541: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41548,12 +41552,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41551: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41555: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41556 "configure"
+#line 41560 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41569,16 +41573,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41575: \$? = $ac_status" >&5
+  echo "$as_me:41579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41581: \$? = $ac_status" >&5
+  echo "$as_me:41585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41592,7 +41596,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41595 "configure"
+#line 41599 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41608,16 +41612,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41614: \$? = $ac_status" >&5
+  echo "$as_me:41618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41620: \$? = $ac_status" >&5
+  echo "$as_me:41624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41634,9 +41638,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41637: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41641: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41639: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41643: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41727,7 +41731,7 @@ 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}:41730: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41734: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41735,7 +41739,7 @@ echo "${as_me:-configure}:41730: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41738 "configure"
+#line 41742 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41751,21 +41755,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41757: \$? = $ac_status" >&5
+  echo "$as_me:41761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41763: \$? = $ac_status" >&5
+  echo "$as_me:41767: \$? = $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}:41768: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41772: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41783,7 +41787,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41786: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41790: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41791,7 +41795,7 @@ echo "${as_me:-configure}:41786: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41794 "configure"
+#line 41798 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41807,21 +41811,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41813: \$? = $ac_status" >&5
+  echo "$as_me:41817: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41819: \$? = $ac_status" >&5
+  echo "$as_me:41823: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:41824: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:41828: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -41902,13 +41906,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}:41905: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41909: 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 41911 "configure"
+#line 41915 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41924,21 +41928,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41927: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41930: \$? = $ac_status" >&5
+  echo "$as_me:41934: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41936: \$? = $ac_status" >&5
+  echo "$as_me:41940: \$? = $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}:41941: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41945: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -42000,7 +42004,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42003 "configure"
+#line 42007 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42012,16 +42016,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42019: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42018: \$? = $ac_status" >&5
+  echo "$as_me:42022: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42024: \$? = $ac_status" >&5
+  echo "$as_me:42028: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42038,7 +42042,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}:42041: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42045: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42074,7 +42078,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}:42077: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42081: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42099,7 +42103,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42102: WARNING: Cannot find z library" >&5
+{ echo "$as_me:42106: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -42108,13 +42112,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42111: checking for $ac_func" >&5
+echo "$as_me:42115: 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 42117 "configure"
+#line 42121 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42145,16 +42149,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42148: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42151: \$? = $ac_status" >&5
+  echo "$as_me:42155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42154: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42157: \$? = $ac_status" >&5
+  echo "$as_me:42161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42164,7 +42168,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42167: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:42171: 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
@@ -42181,7 +42185,7 @@ EOF
 
 fi
 
-echo "$as_me:42184: checking if you want to use brotli decompression" >&5
+echo "$as_me:42188: checking if you want to use brotli decompression" >&5
 echo $ECHO_N "checking if you want to use brotli decompression... $ECHO_C" >&6
 
 # Check whether --with-brotli or --without-brotli was given.
@@ -42191,7 +42195,7 @@ if test "${with_brotli+set}" = set; then
 else
   use_brotli=no
 fi;
-echo "$as_me:42194: result: $use_brotli" >&5
+echo "$as_me:42198: result: $use_brotli" >&5
 echo "${ECHO_T}$use_brotli" >&6
 
 if test ".$use_brotli" != ".no" ; then
@@ -42233,7 +42237,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42236 "configure"
+#line 42240 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42245,16 +42249,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42251: \$? = $ac_status" >&5
+  echo "$as_me:42255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42257: \$? = $ac_status" >&5
+  echo "$as_me:42261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42271,7 +42275,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}:42274: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42278: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42317,7 +42321,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42320 "configure"
+#line 42324 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42329,16 +42333,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42335: \$? = $ac_status" >&5
+  echo "$as_me:42339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42341: \$? = $ac_status" >&5
+  echo "$as_me:42345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42355,7 +42359,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}:42358: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42362: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42373,7 +42377,7 @@ echo "${as_me:-configure}:42358: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:42376: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42380: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42398,7 +42402,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}:42401: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42405: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42427,7 +42431,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}:42430: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42434: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42436,7 +42440,7 @@ echo "${as_me:-configure}:42430: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:42439: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42443: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42450,12 +42454,12 @@ esac
 cf_cv_header_path_brotlidec=
 cf_cv_library_path_brotlidec=
 
-echo "${as_me:-configure}:42453: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42457: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42458 "configure"
+#line 42462 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42478,16 +42482,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42484: \$? = $ac_status" >&5
+  echo "$as_me:42488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42490: \$? = $ac_status" >&5
+  echo "$as_me:42494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42501,7 +42505,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbrotlidec  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42504 "configure"
+#line 42508 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42524,16 +42528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42530: \$? = $ac_status" >&5
+  echo "$as_me:42534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42536: \$? = $ac_status" >&5
+  echo "$as_me:42540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42550,9 +42554,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for brotlidec library" 1>&6
 
-echo "${as_me:-configure}:42553: testing find linkage for brotlidec library ..." 1>&5
+echo "${as_me:-configure}:42557: testing find linkage for brotlidec library ..." 1>&5
 
-echo "${as_me:-configure}:42555: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42559: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42643,7 +42647,7 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d "$cf_cv_header_path_brotlidec" ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42646: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42650: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -42651,7 +42655,7 @@ echo "${as_me:-configure}:42646: testing ... testing $cf_cv_header_path_brotlide
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 42654 "configure"
+#line 42658 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42674,21 +42678,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42680: \$? = $ac_status" >&5
+  echo "$as_me:42684: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42686: \$? = $ac_status" >&5
+  echo "$as_me:42690: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 				test -n "$verbose" && echo "	... found brotlidec headers in $cf_cv_header_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42691: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42695: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
 
 				cf_cv_find_linkage_brotlidec=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42706,7 +42710,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_brotlidec" = maybe ; then
 
-echo "${as_me:-configure}:42709: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42713: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42714,7 +42718,7 @@ echo "${as_me:-configure}:42709: testing Searching for brotlidec library in FIND
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbrotlidec  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42717 "configure"
+#line 42721 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42737,21 +42741,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42743: \$? = $ac_status" >&5
+  echo "$as_me:42747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42749: \$? = $ac_status" >&5
+  echo "$as_me:42753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found brotlidec library in system" 1>&6
 
-echo "${as_me:-configure}:42754: testing ... found brotlidec library in system ..." 1>&5
+echo "${as_me:-configure}:42758: testing ... found brotlidec library in system ..." 1>&5
 
 			cf_cv_find_linkage_brotlidec=yes
 else
@@ -42832,13 +42836,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d "$cf_cv_library_path_brotlidec" ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42835: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42839: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lbrotlidec  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_brotlidec"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 42841 "configure"
+#line 42845 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42861,21 +42865,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42867: \$? = $ac_status" >&5
+  echo "$as_me:42871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42873: \$? = $ac_status" >&5
+  echo "$as_me:42877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 					test -n "$verbose" && echo "	... found brotlidec library in $cf_cv_library_path_brotlidec" 1>&6
 
-echo "${as_me:-configure}:42878: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42882: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
 
 					cf_cv_find_linkage_brotlidec=yes
 					cf_cv_library_file_brotlidec="-lbrotlidec"
@@ -42937,7 +42941,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42940 "configure"
+#line 42944 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42949,16 +42953,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42955: \$? = $ac_status" >&5
+  echo "$as_me:42959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42961: \$? = $ac_status" >&5
+  echo "$as_me:42965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42975,7 +42979,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}:42978: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42982: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -43011,7 +43015,7 @@ if test -n "$cf_cv_library_path_brotlidec" ; 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}:43014: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:43018: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -43036,7 +43040,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:43039: WARNING: Cannot find brotlidec library" >&5
+{ echo "$as_me:43043: WARNING: Cannot find brotlidec library" >&5
 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
 fi
 
@@ -43047,7 +43051,7 @@ EOF
 
 fi
 
-echo "$as_me:43050: checking if you want to exclude FINGER code" >&5
+echo "$as_me:43054: 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.
@@ -43064,14 +43068,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:43067: result: $use_finger" >&5
+echo "$as_me:43071: 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:43074: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:43078: 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.
@@ -43088,14 +43092,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:43091: result: $use_gopher" >&5
+echo "$as_me:43095: 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:43098: checking if you want to exclude NEWS code" >&5
+echo "$as_me:43102: 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.
@@ -43112,14 +43116,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:43115: result: $use_news" >&5
+echo "$as_me:43119: 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:43122: checking if you want to exclude FTP code" >&5
+echo "$as_me:43126: 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.
@@ -43136,14 +43140,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:43139: result: $use_ftp" >&5
+echo "$as_me:43143: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test "$use_ftp" != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:43146: checking if you want to include WAIS code" >&5
+echo "$as_me:43150: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -43160,13 +43164,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:43163: result: $use_wais" >&5
+echo "$as_me:43167: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:43169: checking for fs_free in -lwais" >&5
+	echo "$as_me:43173: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43174,7 +43178,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 43177 "configure"
+#line 43181 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43193,16 +43197,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43199: \$? = $ac_status" >&5
+  echo "$as_me:43203: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43205: \$? = $ac_status" >&5
+  echo "$as_me:43209: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -43213,18 +43217,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43216: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:43220: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test "$ac_cv_lib_wais_fs_free" = yes; then
 
-echo "$as_me:43220: checking if -lm needed for math functions" >&5
+echo "$as_me:43224: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 43227 "configure"
+#line 43231 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43240,16 +43244,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43246: \$? = $ac_status" >&5
+  echo "$as_me:43250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43252: \$? = $ac_status" >&5
+  echo "$as_me:43256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -43259,7 +43263,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43262: result: $cf_cv_need_libm" >&5
+echo "$as_me:43266: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -43267,14 +43271,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:43270: checking if -lm is available for math functions" >&5
+	echo "$as_me:43274: checking if -lm is available for math functions" >&5
 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6
 if test "${cf_cv_have_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 43277 "configure"
+#line 43281 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43290,16 +43294,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43296: \$? = $ac_status" >&5
+  echo "$as_me:43300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43302: \$? = $ac_status" >&5
+  echo "$as_me:43306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -43309,7 +43313,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43312: result: $cf_cv_have_libm" >&5
+echo "$as_me:43316: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -43365,23 +43369,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43368: checking for $ac_header" >&5
+echo "$as_me:43372: 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 43374 "configure"
+#line 43378 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43378: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:43382: \"$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:43384: \$? = $ac_status" >&5
+  echo "$as_me:43388: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43400,7 +43404,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:43403: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:43407: 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
@@ -43413,7 +43417,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:43416: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:43420: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -43421,7 +43425,7 @@ fi
 
 # 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:43424: checking if directory-editor code should be used" >&5
+echo "$as_me:43428: 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.
@@ -43438,7 +43442,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:43441: result: $use_dired" >&5
+echo "$as_me:43445: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -43448,7 +43452,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:43451: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:43455: 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.
@@ -43465,10 +43469,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43468: result: $enableval" >&5
+	echo "$as_me:43472: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43471: checking if DirEd mode should override keys" >&5
+	echo "$as_me:43475: 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.
@@ -43492,10 +43496,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43495: result: $enableval" >&5
+	echo "$as_me:43499: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43498: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43502: 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.
@@ -43519,10 +43523,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43522: result: $enableval" >&5
+	echo "$as_me:43526: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43525: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43529: 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.
@@ -43539,10 +43543,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43542: result: $enableval" >&5
+	echo "$as_me:43546: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43545: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43549: 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.
@@ -43566,10 +43570,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43569: result: $enableval" >&5
+	echo "$as_me:43573: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43572: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43576: 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.
@@ -43593,10 +43597,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43596: result: $enableval" >&5
+	echo "$as_me:43600: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43599: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43603: 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.
@@ -43620,10 +43624,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43623: result: $enableval" >&5
+	echo "$as_me:43627: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43626: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43630: 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.
@@ -43647,11 +43651,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43650: result: $enableval" >&5
+	echo "$as_me:43654: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:43654: checking if you want long-directory listings" >&5
+echo "$as_me:43658: 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.
@@ -43675,10 +43679,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:43678: result: $enableval" >&5
+echo "$as_me:43682: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:43681: checking if parent-directory references are permitted" >&5
+echo "$as_me:43685: 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.
@@ -43695,7 +43699,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:43698: result: $enableval" >&5
+echo "$as_me:43702: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -43703,7 +43707,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:43706: checking for $ac_word" >&5
+echo "$as_me:43710: 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
@@ -43720,7 +43724,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:43723: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43727: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43731,10 +43735,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:43734: result: $TELNET" >&5
+  echo "$as_me:43738: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:43737: result: no" >&5
+  echo "$as_me:43741: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43793,7 +43797,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43796: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43800: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -43811,7 +43815,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:43814: checking for $ac_word" >&5
+echo "$as_me:43818: 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
@@ -43828,7 +43832,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:43831: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43835: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43839,10 +43843,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:43842: result: $TN3270" >&5
+  echo "$as_me:43846: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:43845: result: no" >&5
+  echo "$as_me:43849: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43901,7 +43905,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43904: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43908: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -43919,7 +43923,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:43922: checking for $ac_word" >&5
+echo "$as_me:43926: 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
@@ -43936,7 +43940,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:43939: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43943: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43947,10 +43951,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:43950: result: $RLOGIN" >&5
+  echo "$as_me:43954: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:43953: result: no" >&5
+  echo "$as_me:43957: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44009,7 +44013,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44012: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44016: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -44027,7 +44031,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:44030: checking for $ac_word" >&5
+echo "$as_me:44034: 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
@@ -44044,7 +44048,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:44047: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44051: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44055,10 +44059,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:44058: result: $MV" >&5
+  echo "$as_me:44062: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:44061: result: no" >&5
+  echo "$as_me:44065: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44117,7 +44121,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44120: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44124: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -44135,7 +44139,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:44138: checking for $ac_word" >&5
+echo "$as_me:44142: 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
@@ -44152,7 +44156,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:44155: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44159: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44163,10 +44167,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:44166: result: $GZIP" >&5
+  echo "$as_me:44170: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:44169: result: no" >&5
+  echo "$as_me:44173: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44225,7 +44229,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44228: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44232: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -44243,7 +44247,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:44246: checking for $ac_word" >&5
+echo "$as_me:44250: 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
@@ -44260,7 +44264,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:44263: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44267: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44271,10 +44275,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:44274: result: $UNCOMPRESS" >&5
+  echo "$as_me:44278: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:44277: result: no" >&5
+  echo "$as_me:44281: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44333,7 +44337,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44336: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44340: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -44351,7 +44355,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:44354: checking for $ac_word" >&5
+echo "$as_me:44358: 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
@@ -44368,7 +44372,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:44371: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44375: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44379,10 +44383,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:44382: result: $UNZIP" >&5
+  echo "$as_me:44386: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:44385: result: no" >&5
+  echo "$as_me:44389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44441,7 +44445,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44444: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44448: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -44459,7 +44463,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:44462: checking for $ac_word" >&5
+echo "$as_me:44466: 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
@@ -44476,7 +44480,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:44479: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44483: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44487,10 +44491,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:44490: result: $BZIP2" >&5
+  echo "$as_me:44494: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:44493: result: no" >&5
+  echo "$as_me:44497: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44549,7 +44553,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44552: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44556: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -44567,7 +44571,7 @@ for ac_prog in $BROTLI brotli
 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:44570: checking for $ac_word" >&5
+echo "$as_me:44574: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_BROTLI+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44584,7 +44588,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_BROTLI="$ac_dir/$ac_word"
-   echo "$as_me:44587: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44591: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44595,10 +44599,10 @@ fi
 BROTLI=$ac_cv_path_BROTLI
 
 if test -n "$BROTLI"; then
-  echo "$as_me:44598: result: $BROTLI" >&5
+  echo "$as_me:44602: result: $BROTLI" >&5
 echo "${ECHO_T}$BROTLI" >&6
 else
-  echo "$as_me:44601: result: no" >&5
+  echo "$as_me:44605: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44657,7 +44661,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44660: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44664: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BROTLI_PATH "$cf_path_prog"
@@ -44675,7 +44679,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:44678: checking for $ac_word" >&5
+echo "$as_me:44682: 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
@@ -44692,7 +44696,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:44695: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44699: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44703,10 +44707,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:44706: result: $TAR" >&5
+  echo "$as_me:44710: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:44709: result: no" >&5
+  echo "$as_me:44713: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44765,7 +44769,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44768: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44772: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -44823,7 +44827,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:44826: checking for $ac_word" >&5
+echo "$as_me:44830: 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
@@ -44840,7 +44844,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:44843: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44847: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44851,10 +44855,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:44854: result: $COMPRESS" >&5
+  echo "$as_me:44858: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:44857: result: no" >&5
+  echo "$as_me:44861: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44913,7 +44917,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44916: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44920: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -44931,7 +44935,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:44934: checking for $ac_word" >&5
+echo "$as_me:44938: 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
@@ -44948,7 +44952,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:44951: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44955: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44959,10 +44963,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:44962: result: $RM" >&5
+  echo "$as_me:44966: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:44965: result: no" >&5
+  echo "$as_me:44969: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45021,7 +45025,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45024: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45028: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -45039,7 +45043,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:45042: checking for $ac_word" >&5
+echo "$as_me:45046: 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
@@ -45056,7 +45060,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:45059: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45063: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45067,10 +45071,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:45070: result: $UUDECODE" >&5
+  echo "$as_me:45074: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:45073: result: no" >&5
+  echo "$as_me:45077: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45129,7 +45133,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45132: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45136: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -45147,7 +45151,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:45150: checking for $ac_word" >&5
+echo "$as_me:45154: 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
@@ -45164,7 +45168,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:45167: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45171: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45175,10 +45179,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:45178: result: $ZCAT" >&5
+  echo "$as_me:45182: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:45181: result: no" >&5
+  echo "$as_me:45185: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45237,7 +45241,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45240: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45244: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -45255,7 +45259,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:45258: checking for $ac_word" >&5
+echo "$as_me:45262: 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
@@ -45272,7 +45276,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:45275: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45279: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45283,10 +45287,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:45286: result: $ZIP" >&5
+  echo "$as_me:45290: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:45289: result: no" >&5
+  echo "$as_me:45293: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45345,7 +45349,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45348: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45352: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -45373,7 +45377,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:45376: checking for $ac_word" >&5
+echo "$as_me:45380: 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
@@ -45390,7 +45394,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:45393: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45397: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45401,10 +45405,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:45404: result: $INSTALL" >&5
+  echo "$as_me:45408: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:45407: result: no" >&5
+  echo "$as_me:45411: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45463,7 +45467,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45466: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45470: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -45493,7 +45497,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:45496: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45500: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -45501,7 +45505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45504 "configure"
+#line 45508 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45520,16 +45524,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45526: \$? = $ac_status" >&5
+  echo "$as_me:45530: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45532: \$? = $ac_status" >&5
+  echo "$as_me:45536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -45540,7 +45544,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45543: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45547: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test "$ac_cv_lib_pdcurses_initscr" = yes; then
 
@@ -45562,13 +45566,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:45565: checking for winwstr" >&5
+	echo "$as_me:45569: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 45571 "configure"
+#line 45575 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45599,16 +45603,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45605: \$? = $ac_status" >&5
+  echo "$as_me:45609: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45611: \$? = $ac_status" >&5
+  echo "$as_me:45615: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -45618,7 +45622,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45621: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45625: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -45628,13 +45632,13 @@ EOF
 
 fi
 
-	echo "$as_me:45631: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45635: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 45637 "configure"
+#line 45641 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45665,16 +45669,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45671: \$? = $ac_status" >&5
+  echo "$as_me:45675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45677: \$? = $ac_status" >&5
+  echo "$as_me:45681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -45684,7 +45688,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45687: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45691: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test "$ac_cv_func_pdcurses_dll_iname" = yes; then
 
@@ -45701,7 +45705,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:45704: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45708: 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=
 
@@ -45712,14 +45716,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:45715: result: yes" >&5
+	echo "$as_me:45719: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45718: result: no" >&5
+	echo "$as_me:45722: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45722: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45726: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -45730,14 +45734,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:45733: result: yes" >&5
+	echo "$as_me:45737: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45736: result: no" >&5
+	echo "$as_me:45740: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45740: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45744: 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=
 
@@ -45748,14 +45752,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:45751: result: yes" >&5
+	echo "$as_me:45755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45754: result: no" >&5
+	echo "$as_me:45758: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45758: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45762: 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=
 
@@ -45766,10 +45770,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:45769: result: yes" >&5
+	echo "$as_me:45773: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45772: result: no" >&5
+	echo "$as_me:45776: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45789,17 +45793,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}:45792: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:45796: 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}:45798: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45802: 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}:45802: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45806: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45930,20 +45934,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:45933: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45937: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:45939: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:45943: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45946 "configure"
+#line 45950 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -45960,16 +45964,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45966: \$? = $ac_status" >&5
+  echo "$as_me:45970: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45972: \$? = $ac_status" >&5
+  echo "$as_me:45976: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -45979,7 +45983,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45982: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:45986: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -45991,7 +45995,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:45994: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:45998: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -45999,17 +46003,17 @@ echo "${as_me:-configure}:45994: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:46002: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:46006: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "xmu" 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:46008: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46012: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:46012: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46016: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46129,12 +46133,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46132: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46136: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:46137: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46141: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -46142,12 +46146,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46145: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46149: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:46150: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46154: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46158,7 +46162,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:46161: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:46165: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -46183,17 +46187,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}:46186: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:46190: 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}:46192: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46196: 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}:46196: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46200: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46314,7 +46318,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:46317: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:46321: 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
@@ -46322,7 +46326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46325 "configure"
+#line 46329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46341,16 +46345,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46347: \$? = $ac_status" >&5
+  echo "$as_me:46351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46353: \$? = $ac_status" >&5
+  echo "$as_me:46357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -46361,7 +46365,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46364: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:46368: 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
 
@@ -46397,17 +46401,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:46400: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46404: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:46406: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46410: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:46410: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46414: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46527,24 +46531,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46530: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46534: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:46537: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46541: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:46543: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46547: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:46547: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46551: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46664,24 +46668,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46667: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46671: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:46674: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46678: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:46680: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46684: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:46684: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46688: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46801,24 +46805,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46804: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:46808: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:46811: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46815: 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}:46817: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46821: 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}:46821: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46825: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46938,7 +46942,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46941: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:46945: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -46951,17 +46955,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}:46954: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46958: 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}:46960: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46964: 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}:46964: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46968: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47082,14 +47086,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:47085: checking for usable X dependency" >&5
+echo "$as_me:47089: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47092 "configure"
+#line 47096 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -47108,16 +47112,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47115: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47114: \$? = $ac_status" >&5
+  echo "$as_me:47118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47120: \$? = $ac_status" >&5
+  echo "$as_me:47124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -47127,30 +47131,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47130: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:47134: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:47136: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:47140: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:47143: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:47147: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "x11" 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:47149: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47153: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:47153: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47157: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47273,12 +47277,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47276: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47280: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:47281: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47285: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47286,14 +47290,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:47289: checking for usable X Toolkit package" >&5
+echo "$as_me:47293: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47296 "configure"
+#line 47300 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -47308,16 +47312,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47314: \$? = $ac_status" >&5
+  echo "$as_me:47318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47320: \$? = $ac_status" >&5
+  echo "$as_me:47324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -47327,7 +47331,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47330: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:47334: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -47341,22 +47345,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:47344: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:47348: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:47349: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:47353: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "ice" 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:47355: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47359: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:47359: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47363: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47475,17 +47479,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:47478: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47482: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   "sm" 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:47484: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47488: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:47488: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47492: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47614,12 +47618,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47617: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47621: 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}:47622: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47626: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47639,7 +47643,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47642: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47646: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47724,7 +47728,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}:47727: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47731: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47734,7 +47738,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}:47737: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47741: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47744,7 +47748,7 @@ 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}:47747: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47751: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -47753,7 +47757,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47756 "configure"
+#line 47760 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47765,16 +47769,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47771: \$? = $ac_status" >&5
+  echo "$as_me:47775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47777: \$? = $ac_status" >&5
+  echo "$as_me:47781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47782,12 +47786,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47785: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47789: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:47790: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:47794: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -47795,13 +47799,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:47798: checking for XOpenDisplay" >&5
+	echo "$as_me:47802: 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 47804 "configure"
+#line 47808 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47832,16 +47836,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47835: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47838: \$? = $ac_status" >&5
+  echo "$as_me:47842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47844: \$? = $ac_status" >&5
+  echo "$as_me:47848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -47851,13 +47855,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47854: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:47858: 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:47860: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:47864: 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
@@ -47865,7 +47869,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47868 "configure"
+#line 47872 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47884,16 +47888,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47890: \$? = $ac_status" >&5
+  echo "$as_me:47894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47896: \$? = $ac_status" >&5
+  echo "$as_me:47900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -47904,7 +47908,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47907: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:47911: 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
 
@@ -47928,13 +47932,13 @@ fi
 
 fi
 
-	echo "$as_me:47931: checking for XtAppInitialize" >&5
+	echo "$as_me:47935: 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 47937 "configure"
+#line 47941 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47965,16 +47969,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47971: \$? = $ac_status" >&5
+  echo "$as_me:47975: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47977: \$? = $ac_status" >&5
+  echo "$as_me:47981: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -47984,13 +47988,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47987: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:47991: 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:47993: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:47997: 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
@@ -47998,7 +48002,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48001 "configure"
+#line 48005 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48017,16 +48021,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48023: \$? = $ac_status" >&5
+  echo "$as_me:48027: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48029: \$? = $ac_status" >&5
+  echo "$as_me:48033: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -48037,7 +48041,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48040: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:48044: 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
 
@@ -48054,7 +48058,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:48057: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:48061: 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
@@ -48095,14 +48099,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:48098: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:48102: 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:48101: checking for $cf_test" >&5
+			echo "$as_me:48105: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48105 "configure"
+#line 48109 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -48116,16 +48120,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48122: \$? = $ac_status" >&5
+  echo "$as_me:48126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48128: \$? = $ac_status" >&5
+  echo "$as_me:48132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48134,7 +48138,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:48137: result: $cf_result" >&5
+		echo "$as_me:48141: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -48150,7 +48154,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:48153: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:48157: WARNING: Unable to find Athena header files" >&5
 echo "$as_me: WARNING: Unable to find Athena header files" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 
@@ -48215,10 +48219,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:48218: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:48222: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48221 "configure"
+#line 48225 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -48234,16 +48238,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48240: \$? = $ac_status" >&5
+  echo "$as_me:48244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48246: \$? = $ac_status" >&5
+  echo "$as_me:48250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48252,7 +48256,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:48255: result: $cf_result" >&5
+		echo "$as_me:48259: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -48269,7 +48273,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:48272: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:48276: 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
@@ -48303,7 +48307,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:48306: checking for $ac_word" >&5
+echo "$as_me:48310: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48318,7 +48322,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:48321: found $ac_dir/$ac_word" >&5
+echo "$as_me:48325: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48326,10 +48330,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:48329: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:48333: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48332: result: no" >&5
+  echo "$as_me:48336: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48342,7 +48346,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:48345: checking for $ac_word" >&5
+echo "$as_me:48349: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -48357,7 +48361,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_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:48360: found $ac_dir/$ac_word" >&5
+echo "$as_me:48364: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48365,10 +48369,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:48368: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:48372: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48371: result: no" >&5
+  echo "$as_me:48375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48503,7 +48507,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48506: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48510: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -48588,7 +48592,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}:48591: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48595: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -48598,7 +48602,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}:48601: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48605: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -48608,7 +48612,7 @@ 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}:48611: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48615: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
@@ -48617,7 +48621,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48620 "configure"
+#line 48624 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -48629,16 +48633,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48635: \$? = $ac_status" >&5
+  echo "$as_me:48639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48641: \$? = $ac_status" >&5
+  echo "$as_me:48645: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -48646,12 +48650,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48649: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48653: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:48654: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48658: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48659,7 +48663,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:48662: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48666: 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
@@ -48667,7 +48671,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48670 "configure"
+#line 48674 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48686,16 +48690,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48693: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48692: \$? = $ac_status" >&5
+  echo "$as_me:48696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48698: \$? = $ac_status" >&5
+  echo "$as_me:48702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48706,7 +48710,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48709: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48713: 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
 
@@ -48728,7 +48732,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:48731: checking for XCurses library" >&5
+echo "$as_me:48735: 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
@@ -48751,7 +48755,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48754 "configure"
+#line 48758 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -48766,16 +48770,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48772: \$? = $ac_status" >&5
+  echo "$as_me:48776: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48778: \$? = $ac_status" >&5
+  echo "$as_me:48782: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -48786,7 +48790,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48789: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:48793: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -48801,23 +48805,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:48804: checking for xcurses.h" >&5
+	echo "$as_me:48808: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 48810 "configure"
+#line 48814 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:48814: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48818: \"$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:48820: \$? = $ac_status" >&5
+  echo "$as_me:48824: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48836,7 +48840,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48839: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:48843: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test "$ac_cv_header_xcurses_h" = yes; then
 
@@ -48847,7 +48851,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:48850: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:48854: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -48856,7 +48860,7 @@ fi
 	esac
 else
 
-echo "$as_me:48859: checking if we can include termio.h with curses" >&5
+echo "$as_me:48863: 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
@@ -48866,7 +48870,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 48869 "configure"
+#line 48873 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -48880,16 +48884,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48886: \$? = $ac_status" >&5
+  echo "$as_me:48890: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48892: \$? = $ac_status" >&5
+  echo "$as_me:48896: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -48902,7 +48906,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:48905: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:48909: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -48919,23 +48923,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:48922: checking for $ac_header" >&5
+echo "$as_me:48926: 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 48928 "configure"
+#line 48932 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48932: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48936: \"$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:48938: \$? = $ac_status" >&5
+  echo "$as_me:48942: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48954,7 +48958,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48957: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48961: 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
@@ -48966,7 +48970,7 @@ done
 
 	fi
 
-echo "$as_me:48969: checking if curses supports alternate-character set" >&5
+echo "$as_me:48973: 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
@@ -48975,7 +48979,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48978 "configure"
+#line 48982 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48989,16 +48993,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48995: \$? = $ac_status" >&5
+  echo "$as_me:48999: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49001: \$? = $ac_status" >&5
+  echo "$as_me:49005: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -49012,21 +49016,21 @@ done
 
 fi
 
-echo "$as_me:49015: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:49019: 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:49022: checking if curses supports fancy attributes" >&5
+echo "$as_me:49026: 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 49029 "configure"
+#line 49033 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49044,16 +49048,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49050: \$? = $ac_status" >&5
+  echo "$as_me:49054: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49056: \$? = $ac_status" >&5
+  echo "$as_me:49060: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -49065,14 +49069,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49068: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:49072: 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:49075: checking for function curses_version" >&5
+echo "$as_me:49079: 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
@@ -49082,7 +49086,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 49085 "configure"
+#line 49089 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49095,15 +49099,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:49098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49101: \$? = $ac_status" >&5
+  echo "$as_me:49105: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:49103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49106: \$? = $ac_status" >&5
+  echo "$as_me:49110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -49118,7 +49122,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:49121: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:49125: 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
@@ -49126,14 +49130,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:49129: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:49133: 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 49136 "configure"
+#line 49140 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49152,16 +49156,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49158: \$? = $ac_status" >&5
+  echo "$as_me:49162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49164: \$? = $ac_status" >&5
+  echo "$as_me:49168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -49173,10 +49177,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49176: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:49180: 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:49179: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:49183: 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
@@ -49186,14 +49190,14 @@ EOF
 fi
 fi
 
-echo "$as_me:49189: checking if curses supports color attributes" >&5
+echo "$as_me:49193: 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 49196 "configure"
+#line 49200 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49213,16 +49217,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49219: \$? = $ac_status" >&5
+  echo "$as_me:49223: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49225: \$? = $ac_status" >&5
+  echo "$as_me:49229: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -49234,7 +49238,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49237: result: $cf_cv_color_curses" >&5
+echo "$as_me:49241: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -49258,23 +49262,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:49261: checking for $ac_header" >&5
+echo "$as_me:49265: 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 49267 "configure"
+#line 49271 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:49271: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49275: \"$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:49277: \$? = $ac_status" >&5
+  echo "$as_me:49281: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49293,7 +49297,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49296: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49300: 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
@@ -49310,10 +49314,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:49313: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:49317: 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 49316 "configure"
+#line 49320 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -49325,16 +49329,16 @@ struct termios foo; int x = foo.c_iflag = 1; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49328: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49332: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49331: \$? = $ac_status" >&5
+  echo "$as_me:49335: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49337: \$? = $ac_status" >&5
+  echo "$as_me:49341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -49342,7 +49346,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49345 "configure"
+#line 49349 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -49356,16 +49360,16 @@ struct termios foo; int x = foo.c_iflag = 2; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49362: \$? = $ac_status" >&5
+  echo "$as_me:49366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49368: \$? = $ac_status" >&5
+  echo "$as_me:49372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -49381,12 +49385,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:49384: result: $termios_bad" >&5
+	echo "$as_me:49388: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:49389: checking declaration of size-change" >&5
+echo "$as_me:49393: 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
@@ -49407,7 +49411,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49410 "configure"
+#line 49414 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -49457,16 +49461,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49463: \$? = $ac_status" >&5
+  echo "$as_me:49467: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49469: \$? = $ac_status" >&5
+  echo "$as_me:49473: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -49485,7 +49489,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49488: result: $cf_cv_sizechange" >&5
+echo "$as_me:49492: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -49503,14 +49507,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:49506: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49510: 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 49513 "configure"
+#line 49517 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -49522,16 +49526,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49528: \$? = $ac_status" >&5
+  echo "$as_me:49532: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49534: \$? = $ac_status" >&5
+  echo "$as_me:49538: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -49543,7 +49547,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49546: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49550: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -49552,14 +49556,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:49555: checking if curses supports wide characters" >&5
+echo "$as_me:49559: 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 49562 "configure"
+#line 49566 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49578,16 +49582,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49585: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49584: \$? = $ac_status" >&5
+  echo "$as_me:49588: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49591: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49590: \$? = $ac_status" >&5
+  echo "$as_me:49594: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -49598,7 +49602,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49601: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49605: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -49608,14 +49612,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:49611: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49615: 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 49618 "configure"
+#line 49622 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49629,23 +49633,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49636: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49635: \$? = $ac_status" >&5
+  echo "$as_me:49639: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49641: \$? = $ac_status" >&5
+  echo "$as_me:49645: \$? = $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 49648 "configure"
+#line 49652 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49660,16 +49664,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49663: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49667: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49666: \$? = $ac_status" >&5
+  echo "$as_me:49670: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49672: \$? = $ac_status" >&5
+  echo "$as_me:49676: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -49681,7 +49685,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:49684: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49688: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -49704,7 +49708,7 @@ fi
 
 	fi
 
-echo "$as_me:49707: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49711: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -49712,7 +49716,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49715 "configure"
+#line 49719 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49744,16 +49748,16 @@ make an error	/* prefer to fall-through on the second checks */
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49750: \$? = $ac_status" >&5
+  echo "$as_me:49754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49756: \$? = $ac_status" >&5
+  echo "$as_me:49760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -49763,7 +49767,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49766 "configure"
+#line 49770 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -49788,16 +49792,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49794: \$? = $ac_status" >&5
+  echo "$as_me:49798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49800: \$? = $ac_status" >&5
+  echo "$as_me:49804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -49811,7 +49815,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49814: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:49818: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -49823,7 +49827,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:49826: checking for term.h" >&5
+echo "$as_me:49830: 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
@@ -49844,7 +49848,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49847 "configure"
+#line 49851 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49858,16 +49862,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49864: \$? = $ac_status" >&5
+  echo "$as_me:49868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49870: \$? = $ac_status" >&5
+  echo "$as_me:49874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -49886,7 +49890,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49889 "configure"
+#line 49893 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49904,16 +49908,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49910: \$? = $ac_status" >&5
+  echo "$as_me:49914: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49916: \$? = $ac_status" >&5
+  echo "$as_me:49920: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -49928,7 +49932,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:49931: result: $cf_cv_term_header" >&5
+echo "$as_me:49935: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -49955,7 +49959,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:49958: checking for unctrl.h" >&5
+echo "$as_me:49962: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -49976,7 +49980,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49979 "configure"
+#line 49983 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49990,16 +49994,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49997: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49996: \$? = $ac_status" >&5
+  echo "$as_me:50000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50002: \$? = $ac_status" >&5
+  echo "$as_me:50006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -50012,12 +50016,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:50015: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:50019: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:50020: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:50024: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -50073,10 +50077,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:50076: checking for ${cf_func}" >&5
+	echo "$as_me:50080: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:50079: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:50083: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -50085,7 +50089,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 50088 "configure"
+#line 50092 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -50118,16 +50122,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50125: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50124: \$? = $ac_status" >&5
+  echo "$as_me:50128: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50130: \$? = $ac_status" >&5
+  echo "$as_me:50134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -50143,7 +50147,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:50146: result: $cf_result" >&5
+	echo "$as_me:50150: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -50160,13 +50164,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:50163: checking for $ac_func" >&5
+echo "$as_me:50167: 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 50169 "configure"
+#line 50173 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -50197,16 +50201,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50203: \$? = $ac_status" >&5
+  echo "$as_me:50207: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50209: \$? = $ac_status" >&5
+  echo "$as_me:50213: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -50216,7 +50220,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:50219: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:50223: 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
@@ -50230,12 +50234,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:50233: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50237: 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:50238: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50242: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -50243,7 +50247,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:50246: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:50250: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -50256,7 +50260,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:50259: checking if rpath-hack should be disabled" >&5
+echo "$as_me:50263: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -50274,22 +50278,22 @@ else
 
 fi;
 if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi
-echo "$as_me:50277: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:50281: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:50282: checking for updated LDFLAGS" >&5
+echo "$as_me:50286: 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:50285: result: maybe" >&5
+	echo "$as_me:50289: 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:50292: checking for $ac_word" >&5
+echo "$as_me:50296: 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
@@ -50304,7 +50308,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:50307: found $ac_dir/$ac_word" >&5
+echo "$as_me:50311: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -50312,10 +50316,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:50315: result: $cf_ldd_prog" >&5
+  echo "$as_me:50319: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:50318: result: no" >&5
+  echo "$as_me:50322: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50329,7 +50333,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 50332 "configure"
+#line 50336 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -50341,16 +50345,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50344: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50347: \$? = $ac_status" >&5
+  echo "$as_me:50351: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50350: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50353: \$? = $ac_status" >&5
+  echo "$as_me:50357: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -50378,7 +50382,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:50381: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:50385: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -50390,11 +50394,11 @@ echo "${as_me:-configure}:50381: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50393: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50397: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50397: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50401: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -50431,7 +50435,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50434: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50438: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50444,11 +50448,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50447: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50451: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50451: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50455: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -50485,7 +50489,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50488: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50492: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50498,14 +50502,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50501: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50505: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50505: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50509: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:50508: result: no" >&5
+	echo "$as_me:50512: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50620,7 +50624,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:50623: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50627: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -50756,7 +50760,7 @@ EOF
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.52.20221009,
+configured by $0, generated by GNU Autoconf 2.52.20221202,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 2003-2021,2022	Thomas E. Dickey
@@ -50801,7 +50805,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:50804: error: ambiguous option: $1
+    { { echo "$as_me:50808: 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;}
@@ -50820,7 +50824,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:50823: error: unrecognized option: $1
+  -*) { { echo "$as_me:50827: 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;}
@@ -50839,7 +50843,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20221009, executed with
+This file was extended by $as_me 2.52.20221202, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -50873,7 +50877,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:50876: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:50880: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -51237,7 +51241,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:51240: creating $ac_file" >&5
+    { echo "$as_me:51244: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -51255,7 +51259,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:51258: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51262: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -51268,7 +51272,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51271: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51275: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51284,7 +51288,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' "$ac_item"`
         if test -z "$ac_used"; then
-          { echo "$as_me:51287: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:51291: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -51293,7 +51297,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:51296: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:51300: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -51338,7 +51342,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
             ac_init=`$EGREP '[ 	]*'$ac_name'[ 	]*=' "$ac_file"`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'`
-              { echo "$as_me:51341: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:51345: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -51349,7 +51353,7 @@ $ac_seen" >&2;}
     $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out
     if test -s "$tmp"/out; then
       ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out`
-      { echo "$as_me:51352: WARNING: Some variables may not be substituted:
+      { echo "$as_me:51356: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -51398,7 +51402,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:51401: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:51405: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -51409,7 +51413,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:51412: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51416: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -51422,7 +51426,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51425: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51429: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51540,7 +51544,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:51543: $ac_file is unchanged" >&5
+      { echo "$as_me:51547: $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 fc698c34..d54e6525 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.341 2022/03/17 20:10:18 tom Exp $
+dnl $LynxId: configure.in,v 1.342 2022/12/03 00:58:19 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -1526,7 +1526,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 		;;
 	esac
 else
-	CF_TERMIO_AND_CURSES(LYCurses.h)
+	CF_TERMIO_AND_CURSES(LYCurses.h,lynx_cfg.h)
 fi
 
 ### These tests must be run after establishing the curses library.
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index 69622d4a..8cbd1a70 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYBookmark.c,v 1.86 2022/07/26 14:39:20 tom Exp $
+ * $LynxId: LYBookmark.c,v 1.87 2022/12/04 20:41:31 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAlert.h>
@@ -198,7 +198,7 @@ static BOOLEAN havevisible(const char *Title);
 static BOOLEAN have8bit(const char *Title);
 static char *title_convert8bit(const char *Title);
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) && !defined(ftruncate)
 #define ftruncate(fd, len) _chsize(fd, len)
 #endif